From 3e72a6d86b7d4a8b655a877787a3e788b21efdc1 Mon Sep 17 00:00:00 2001 From: Gary Pendergast Date: Tue, 13 Aug 2019 14:04:06 +1000 Subject: [PATCH] Set the WORKDIR in PHP images (#7) --- 5.2/php/Dockerfile | 2 ++ 5.2/php/entrypoint.sh | 2 -- 5.3/php/Dockerfile | 2 ++ 5.3/php/entrypoint.sh | 2 -- 5.4/php/Dockerfile | 2 ++ 5.4/php/entrypoint.sh | 2 -- 5.5/php/Dockerfile | 2 ++ 5.5/php/entrypoint.sh | 2 -- 5.6/php/Dockerfile | 2 ++ 5.6/php/entrypoint.sh | 2 -- 7.0/php/Dockerfile | 2 ++ 7.0/php/entrypoint.sh | 2 -- 7.1/php/Dockerfile | 2 ++ 7.1/php/entrypoint.sh | 2 -- 7.2/php/Dockerfile | 2 ++ 7.2/php/entrypoint.sh | 2 -- 7.3/php/Dockerfile | 2 ++ 7.3/php/entrypoint.sh | 2 -- 7.4/php/Dockerfile | 2 ++ 7.4/php/entrypoint.sh | 2 -- 8.0/php/Dockerfile | 2 ++ 8.0/php/entrypoint.sh | 2 -- Dockerfile-php.template | 2 ++ 23 files changed, 24 insertions(+), 22 deletions(-) diff --git a/5.2/php/Dockerfile b/5.2/php/Dockerfile index e7b155c..f07a0da 100644 --- a/5.2/php/Dockerfile +++ b/5.2/php/Dockerfile @@ -1,5 +1,7 @@ FROM devilbox/php-fpm-5.2:latest +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/5.2/php/entrypoint.sh b/5.2/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/5.2/php/entrypoint.sh +++ b/5.2/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/5.3/php/Dockerfile b/5.3/php/Dockerfile index c8f75ca..9ae8ca3 100644 --- a/5.3/php/Dockerfile +++ b/5.3/php/Dockerfile @@ -1,5 +1,7 @@ FROM devilbox/php-fpm-5.3:latest +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/5.3/php/entrypoint.sh b/5.3/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/5.3/php/entrypoint.sh +++ b/5.3/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/5.4/php/Dockerfile b/5.4/php/Dockerfile index ec8bbf3..77b2ec3 100644 --- a/5.4/php/Dockerfile +++ b/5.4/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:5.4-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/5.4/php/entrypoint.sh b/5.4/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/5.4/php/entrypoint.sh +++ b/5.4/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/5.5/php/Dockerfile b/5.5/php/Dockerfile index 06f0b57..9446b6b 100644 --- a/5.5/php/Dockerfile +++ b/5.5/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:5.5-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/5.5/php/entrypoint.sh b/5.5/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/5.5/php/entrypoint.sh +++ b/5.5/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/5.6/php/Dockerfile b/5.6/php/Dockerfile index 8adfae9..44381ad 100644 --- a/5.6/php/Dockerfile +++ b/5.6/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:5.6-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/5.6/php/entrypoint.sh b/5.6/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/5.6/php/entrypoint.sh +++ b/5.6/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/7.0/php/Dockerfile b/7.0/php/Dockerfile index 835a68d..c57eb58 100644 --- a/7.0/php/Dockerfile +++ b/7.0/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:7.0-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/7.0/php/entrypoint.sh b/7.0/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/7.0/php/entrypoint.sh +++ b/7.0/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/7.1/php/Dockerfile b/7.1/php/Dockerfile index f127a0e..d327d88 100644 --- a/7.1/php/Dockerfile +++ b/7.1/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:7.1-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/7.1/php/entrypoint.sh b/7.1/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/7.1/php/entrypoint.sh +++ b/7.1/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/7.2/php/Dockerfile b/7.2/php/Dockerfile index 51b5c14..8c88697 100644 --- a/7.2/php/Dockerfile +++ b/7.2/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:7.2-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/7.2/php/entrypoint.sh b/7.2/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/7.2/php/entrypoint.sh +++ b/7.2/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/7.3/php/Dockerfile b/7.3/php/Dockerfile index aac5ae6..6618dc5 100644 --- a/7.3/php/Dockerfile +++ b/7.3/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:7.3-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/7.3/php/entrypoint.sh b/7.3/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/7.3/php/entrypoint.sh +++ b/7.3/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/7.4/php/Dockerfile b/7.4/php/Dockerfile index bbde262..1fb1c16 100644 --- a/7.4/php/Dockerfile +++ b/7.4/php/Dockerfile @@ -1,5 +1,7 @@ FROM php:7.4-rc-fpm +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/7.4/php/entrypoint.sh b/7.4/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/7.4/php/entrypoint.sh +++ b/7.4/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/8.0/php/Dockerfile b/8.0/php/Dockerfile index 28cfde7..85ef365 100644 --- a/8.0/php/Dockerfile +++ b/8.0/php/Dockerfile @@ -1,5 +1,7 @@ FROM devilbox/php-fpm-8.0:latest +WORKDIR /var/www + ########################################################################## # # WARNING: This file was generated by update.php. Do not edit it directly. diff --git a/8.0/php/entrypoint.sh b/8.0/php/entrypoint.sh index c8175fd..51f8e5e 100644 --- a/8.0/php/entrypoint.sh +++ b/8.0/php/entrypoint.sh @@ -17,7 +17,5 @@ else rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini fi - - # Execute CMD exec "$@" diff --git a/Dockerfile-php.template b/Dockerfile-php.template index c77853b..804a3b8 100644 --- a/Dockerfile-php.template +++ b/Dockerfile-php.template @@ -1,5 +1,7 @@ FROM %%BASE_NAME%% +WORKDIR /var/www + %%GENERATED_WARNING%% %%INSTALL_EXTENSIONS%%