feat: move env variables to docker-cron-entrypoint

netlogix · Oct 29, 2024 · 131f702 · 131f702
1 parent afdb326
commit 131f702
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/php/8.2.Dockerfile b/php/8.2.Dockerfile
@@ -151,10 +151,6 @@ FROM php-cli AS php-cron
 
 WORKDIR /var/www
 
-ENV VHOST_PATH="/var/www"
-ENV CRONTAB_PATH=""
-ENV CRON_USER=www-data
-
 COPY --chmod=0755 cron/docker-cron-entrypoint /usr/local/bin/
 
 ENTRYPOINT ["docker-cron-entrypoint"]
@@ -225,10 +221,6 @@ FROM php-cli-dev AS php-cron-dev
 
 WORKDIR /var/www
 
-ENV VHOST_PATH="/var/www"
-ENV CRONTAB_PATH=""
-ENV CRON_USER=www-data
-
 COPY --chmod=0755 cron/docker-cron-entrypoint /usr/local/bin/
 
 # Disabling the health check of the descendant php-fpm-dev image, since the production php-cron image does neither have a healthcheck.

diff --git a/php/Dockerfile b/php/Dockerfile
@@ -147,10 +147,6 @@ FROM php-cli AS php-cron
 
 WORKDIR /var/www
 
-ENV VHOST_PATH="/var/www"
-ENV CRONTAB_PATH=""
-ENV CRON_USER=www-data
-
 COPY --chmod=0755 cron/docker-cron-entrypoint /usr/local/bin/
 
 ENTRYPOINT ["docker-cron-entrypoint"]
@@ -221,10 +217,6 @@ FROM php-cli-dev AS php-cron-dev
 
 WORKDIR /var/www
 
-ENV VHOST_PATH="/var/www"
-ENV CRONTAB_PATH=""
-ENV CRON_USER=www-data
-
 COPY --chmod=0755 cron/docker-cron-entrypoint /usr/local/bin/
 
 # Disabling the health check of the descendant php-fpm-dev image, since the production php-cron image does neither have a healthcheck.

diff --git a/php/cron/docker-cron-entrypoint b/php/cron/docker-cron-entrypoint
@@ -4,6 +4,7 @@ set -e
 env > /etc/environment
 
 CRONTAB_PATH="${CRONTAB_PATH:-/var/www/Configuration/crontab}"
+CRON_USER="${CRON_USER:-www-data}"
 
 # init crontab file
 if [ -f $CRONTAB_PATH ]; then