From 83e95cf42fb5785855a7a4fb1b34cc0b958983c0 Mon Sep 17 00:00:00 2001 From: Douwe Hoogeveen Date: Fri, 24 Sep 2021 11:36:53 +0200 Subject: [PATCH] Commit for Dev Comparisson --- .env.example | 34 ------------------------------ docker/config/docker-entrypoint.sh | 3 ++- docker/config/php | 8 +++---- 3 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 .env.example diff --git a/.env.example b/.env.example deleted file mode 100644 index ef6adbe2..00000000 --- a/.env.example +++ /dev/null @@ -1,34 +0,0 @@ -APP_ENV=local -APP_DEBUG=true -APP_KEY=SomeRandomString -APP_URL=http://localhost - -DB_CONNECTION=mysql -DB_HOST=database -DB_PORT=3306 -DB_DATABASE=wpl -DB_USERNAME=root -DB_PASSWORD=somePassword - -DASHBOARD_USERNAME=wpldashboard -DASHBOARD_PASSWORD=WPLdashboard - -CACHE_DRIVER=file -SESSION_DRIVER=file -QUEUE_DRIVER=sync - -REDIS_HOST=127.0.0.1 -REDIS_PASSWORD=null -REDIS_PORT=6379 - -MAIL_DRIVER=sendmail -MAIL_HOST=mailtrap.io -MAIL_PORT=2525 -MAIL_USERNAME=null -MAIL_PASSWORD=null -MAIL_ENCRYPTION=null - -# xDebug config -host_lan_ip=192.168.1.213 - -canvas_secret=1234secret4321 diff --git a/docker/config/docker-entrypoint.sh b/docker/config/docker-entrypoint.sh index db076c9b..6e59af6d 100644 --- a/docker/config/docker-entrypoint.sh +++ b/docker/config/docker-entrypoint.sh @@ -2,5 +2,6 @@ set -e -cron && php-fpm +#cron && +php-fpm diff --git a/docker/config/php b/docker/config/php index 233516a5..e8e54408 100644 --- a/docker/config/php +++ b/docker/config/php @@ -36,12 +36,12 @@ RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | APT_KEY_DONT_WARN_ON_DAN WORKDIR /var/www -RUN apt-get update && apt-get -y install cron +# RUN apt-get update && apt-get -y install cron -COPY ./docker/config/tasks_cron /etc/cron.d/tasks_cron -RUN chmod 0644 /etc/cron.d/tasks_cron && chmod 0644 /etc/cron.d/tasks_cron +# COPY ./docker/config/tasks_cron /etc/cron.d/tasks_cron +# RUN chmod 0644 /etc/cron.d/tasks_cron && chmod 0644 /etc/cron.d/tasks_cron -RUN /usr/bin/crontab /etc/cron.d/tasks_cron +# RUN /usr/bin/crontab /etc/cron.d/tasks_cron COPY ./docker/config/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN chmod +x /usr/local/bin/docker-entrypoint.sh