wait #6278

diff --git a/.docker/dev/config/cron/crontab b/.docker/dev/config/cron/crontab
index b4fcabe16c3ab000b1b0d9aaf79160a4bc678fa4..563b0d032c08f9d7cc1d5ba2cef97827993aabd5 100644 (file)
--- 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 2e5bd84c0281664d2347703ac05dccd9e2b03848..1a84325e0692c5d060fb263add30d696d8b7d4d4 100644 (file)
--- 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 5f2fd39a67fd8dd4db6a407406843f302f00d3e9..10033608c4f20449d77df6ce0f135f66fadb734d 100644 (file)
--- 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 0314c12ea96f3ba45c02c564b572d669b68b213a..308748269a2ef2c384fe7d5fadf4055d37aa0c1e 100644 (file)
--- 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 2e257b545897794c09d37db0aa7bc379fc280876..9f81d78ae4c333d35e832defa6f8c5cc9ccfe3a5 100644 (file)
--- 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