From 76b98c0ed60cf3fa9231e92a3eb3df2bd031bf9d Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Mon, 9 Oct 2023 17:01:24 +0200 Subject: [PATCH] wait #6278 --- .docker/dev/config/cron/crontab | 5 ----- .docker/dev/images/php-fpm/Dockerfile | 2 +- .docker/dev/images/php-fpm/startup | 2 +- .docker/dev/update | 3 ++- .docker/production/update | 1 + 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.docker/dev/config/cron/crontab b/.docker/dev/config/cron/crontab index b4fcabe..563b0d0 100644 --- a/.docker/dev/config/cron/crontab +++ b/.docker/dev/config/cron/crontab @@ -1,6 +1 @@ -MAILTO=sysadmin@cubedesigners.com -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - * * * * * runuser -l pmi-dev -c '/usr/bin/php /application/artisan schedule:run' > /proc/1/fd/1 2>/proc/1/fd/2 -20 5 * * * /application/scripts/restartworkers > /proc/1/fd/1 2>/proc/1/fd/2 diff --git a/.docker/dev/images/php-fpm/Dockerfile b/.docker/dev/images/php-fpm/Dockerfile index 2e5bd84..1a84325 100644 --- a/.docker/dev/images/php-fpm/Dockerfile +++ b/.docker/dev/images/php-fpm/Dockerfile @@ -20,7 +20,7 @@ RUN apt update \ # Add Nodejs Repository RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg -RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_12.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list +RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_16.x focal main" | tee /etc/apt/sources.list.d/nodesource.list RUN apt update diff --git a/.docker/dev/images/php-fpm/startup b/.docker/dev/images/php-fpm/startup index 5f2fd39..1003360 100644 --- a/.docker/dev/images/php-fpm/startup +++ b/.docker/dev/images/php-fpm/startup @@ -11,7 +11,7 @@ chown -R pmi-dev:www-data /application start-stop-daemon --start -b -x /usr/sbin/rsyslogd -- -n # SSH Server -ssh-keygen -A +cd /etc/ssh/ && ssh-keygen -A chmod 755 /etc/ssh/*.d chmod 600 /etc/ssh/*_key chmod 750 /application diff --git a/.docker/dev/update b/.docker/dev/update index 0314c12..3087482 100644 --- a/.docker/dev/update +++ b/.docker/dev/update @@ -1,8 +1,9 @@ #!/bin/sh cd /docker/pmi-dev -chmod -R 777 ./esdata docker network create pmi-dev +dos2unix ./images/php-fpm/startup + chmod -R 777 ./esdata chown -R 999:999 ./database/data chown 0:0 ./config/cron/crontab diff --git a/.docker/production/update b/.docker/production/update index 2e257b5..9f81d78 100644 --- a/.docker/production/update +++ b/.docker/production/update @@ -1,6 +1,7 @@ #!/bin/sh cd /docker/pmi +dos2unix ./images/php-fpm/startup chmod -R 777 ./esdata chown -R 999:999 ./database/data chown 0:0 ./config/cron/crontab -- 2.39.5