diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 91ee38d..90c1281 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php \ && apt-get update \ && echo "Package: *\nPin: release o=LP-PPA-ondrej-php5\nPin-Priority: 1001" > /etc/apt/preferences.d/ondrej \ - && apt-get install -y php5.6-fpm php5.6-sqlite3 php5.6-pgsql php5.6-mysql php5.6-mcrypt php5.6-mbstring php5.6-intl php5.6-gd php5.6-curl php5.6-xml php5.6-xsl php5.6-xdebug php5.6-zip \ + && apt-get install -y php5.6-fpm php5.6-sqlite3 php5.6-pgsql php5.6-mysql php5.6-mbstring php5.6-intl php5.6-gd php5.6-curl php5.6-xml php5.6-xsl php5.6-xdebug php5.6-zip php5.6-mcrypt \ && apt-get install -y php-pear \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ @@ -20,7 +20,7 @@ RUN apt-get update \ && echo $TZ > /etc/timezone \ && dpkg-reconfigure -f noninteractive tzdata -RUN phpenmod -v 5.6 -s ALL sqlite3 pgsql mysql mcrypt mbstring intl gd curl xml xsl xdebug zip +RUN phpenmod -v 5.6 -s ALL sqlite3 pgsql mysql mbstring intl gd curl xml xsl xdebug zip mcrypt # supply but disable xdebug; can be enabled by custom volume-mount ini file RUN phpdismod -v 5.6 -s ALL xdebug @@ -29,11 +29,9 @@ RUN phpdismod -v 5.6 -s ALL xdebug RUN php5.6 -r 'readfile("https://getcomposer.org/installer");' > composer-setup.php \ && php5.6 composer-setup.php --install-dir=/usr/local/bin --filename=composer \ && rm composer-setup.php +RUN composer global require hirak/prestissimo -# install phing -RUN export PHP_PEAR_PHP_BIN=php5.6 \ - && pear channel-discover pear.phing.info \ - && pear install phing/phing +ENV PATH="${PATH}:/root/.composer/vendor/bin" # Prepare run directory\nRUN mkdir /run/php\n\nWORKDIR /var/www\n\n" >> 5.6/fpm/Dockerfile COPY php-fpm.conf /etc/php/5.6/fpm/php-fpm.conf diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index c403c49..de74cf6 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php \ && apt-get update \ && echo "Package: *\nPin: release o=LP-PPA-ondrej-php5\nPin-Priority: 1001" > /etc/apt/preferences.d/ondrej \ - && apt-get install -y php7.0-fpm php7.0-sqlite3 php7.0-pgsql php7.0-mysql php7.0-mcrypt php7.0-mbstring php7.0-intl php7.0-gd php7.0-curl php7.0-xml php7.0-xsl php7.0-xdebug php7.0-zip \ + && apt-get install -y php7.0-fpm php7.0-sqlite3 php7.0-pgsql php7.0-mysql php7.0-mbstring php7.0-intl php7.0-gd php7.0-curl php7.0-xml php7.0-xsl php7.0-xdebug php7.0-zip php7.0-mcrypt \ && apt-get install -y php-pear \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ @@ -20,7 +20,7 @@ RUN apt-get update \ && echo $TZ > /etc/timezone \ && dpkg-reconfigure -f noninteractive tzdata -RUN phpenmod -v 7.0 -s ALL sqlite3 pgsql mysql mcrypt mbstring intl gd curl xml xsl xdebug zip +RUN phpenmod -v 7.0 -s ALL sqlite3 pgsql mysql mbstring intl gd curl xml xsl xdebug zip mcrypt # supply but disable xdebug; can be enabled by custom volume-mount ini file RUN phpdismod -v 7.0 -s ALL xdebug @@ -29,11 +29,9 @@ RUN phpdismod -v 7.0 -s ALL xdebug RUN php7.0 -r 'readfile("https://getcomposer.org/installer");' > composer-setup.php \ && php7.0 composer-setup.php --install-dir=/usr/local/bin --filename=composer \ && rm composer-setup.php +RUN composer global require hirak/prestissimo -# install phing -RUN export PHP_PEAR_PHP_BIN=php7.0 \ - && pear channel-discover pear.phing.info \ - && pear install phing/phing +ENV PATH="${PATH}:/root/.composer/vendor/bin" # Prepare run directory\nRUN mkdir /run/php\n\nWORKDIR /var/www\n\n" >> 7.0/fpm/Dockerfile COPY php-fpm.conf /etc/php/7.0/fpm/php-fpm.conf diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile index 350b29e..ee4d678 100644 --- a/7.1/fpm/Dockerfile +++ b/7.1/fpm/Dockerfile @@ -12,7 +12,7 @@ RUN apt-get update \ && LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php \ && apt-get update \ && echo "Package: *\nPin: release o=LP-PPA-ondrej-php5\nPin-Priority: 1001" > /etc/apt/preferences.d/ondrej \ - && apt-get install -y php7.1-fpm php7.1-sqlite3 php7.1-pgsql php7.1-mysql php7.1-mcrypt php7.1-mbstring php7.1-intl php7.1-gd php7.1-curl php7.1-xml php7.1-xsl php7.1-xdebug php7.1-zip \ + && apt-get install -y php7.1-fpm php7.1-sqlite3 php7.1-pgsql php7.1-mysql php7.1-mbstring php7.1-intl php7.1-gd php7.1-curl php7.1-xml php7.1-xsl php7.1-xdebug php7.1-zip php7.1-mcrypt \ && apt-get install -y php-pear \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ @@ -20,7 +20,7 @@ RUN apt-get update \ && echo $TZ > /etc/timezone \ && dpkg-reconfigure -f noninteractive tzdata -RUN phpenmod -v 7.1 -s ALL sqlite3 pgsql mysql mcrypt mbstring intl gd curl xml xsl xdebug zip +RUN phpenmod -v 7.1 -s ALL sqlite3 pgsql mysql mbstring intl gd curl xml xsl xdebug zip mcrypt # supply but disable xdebug; can be enabled by custom volume-mount ini file RUN phpdismod -v 7.1 -s ALL xdebug @@ -29,11 +29,9 @@ RUN phpdismod -v 7.1 -s ALL xdebug RUN php7.1 -r 'readfile("https://getcomposer.org/installer");' > composer-setup.php \ && php7.1 composer-setup.php --install-dir=/usr/local/bin --filename=composer \ && rm composer-setup.php +RUN composer global require hirak/prestissimo -# install phing -RUN export PHP_PEAR_PHP_BIN=php7.1 \ - && pear channel-discover pear.phing.info \ - && pear install phing/phing +ENV PATH="${PATH}:/root/.composer/vendor/bin" # Prepare run directory\nRUN mkdir /run/php\n\nWORKDIR /var/www\n\n" >> 7.1/fpm/Dockerfile COPY php-fpm.conf /etc/php/7.1/fpm/php-fpm.conf diff --git a/7.1/nginx/Dockerfile b/7.1/nginx/Dockerfile index 4ebaf08..5751029 100644 --- a/7.1/nginx/Dockerfile +++ b/7.1/nginx/Dockerfile @@ -19,6 +19,6 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \ && ln -sf /dev/stderr /var/log/nginx/error.log COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf -COPY nginx-site.conf /etc/nginx/sites-enabled/default +COPY nginx-site.conf /etc/nginx/conf.d/default.conf CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] diff --git a/7.2/fpm/Dockerfile b/7.2/fpm/Dockerfile new file mode 100644 index 0000000..131f6c6 --- /dev/null +++ b/7.2/fpm/Dockerfile @@ -0,0 +1,38 @@ +# Beware: This file is generated by the generate.sh script! +FROM ubuntu:16.04 +MAINTAINER 25th-floor GmbH +EXPOSE 9000 + +ENV DEBIAN_FRONTEND noninteractive +ENV TZ=Europe/Vienna + +RUN apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get install -y software-properties-common language-pack-en-base language-pack-de git unzip tzdata \ + && LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php \ + && apt-get update \ + && echo "Package: *\nPin: release o=LP-PPA-ondrej-php5\nPin-Priority: 1001" > /etc/apt/preferences.d/ondrej \ + && apt-get install -y php7.2-fpm php7.2-sqlite3 php7.2-pgsql php7.2-mysql php7.2-mbstring php7.2-intl php7.2-gd php7.2-curl php7.2-xml php7.2-xsl php7.2-xdebug php7.2-zip \ + && apt-get install -y php-pear \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \ + && echo $TZ > /etc/timezone \ + && dpkg-reconfigure -f noninteractive tzdata + +RUN phpenmod -v 7.2 -s ALL sqlite3 pgsql mysql mbstring intl gd curl xml xsl xdebug zip + +# supply but disable xdebug; can be enabled by custom volume-mount ini file +RUN phpdismod -v 7.2 -s ALL xdebug + +# install composer +RUN php7.2 -r 'readfile("https://getcomposer.org/installer");' > composer-setup.php \ + && php7.2 composer-setup.php --install-dir=/usr/local/bin --filename=composer \ + && rm composer-setup.php +RUN composer global require hirak/prestissimo + +ENV PATH="${PATH}:/root/.composer/vendor/bin" + +# Prepare run directory\nRUN mkdir /run/php\n\nWORKDIR /var/www\n\n" >> 7.2/fpm/Dockerfile +COPY php-fpm.conf /etc/php/7.2/fpm/php-fpm.conf +CMD ["php-fpm7.2"] \ No newline at end of file diff --git a/7.2/fpm/php-fpm.conf b/7.2/fpm/php-fpm.conf new file mode 100644 index 0000000..4d7f9d0 --- /dev/null +++ b/7.2/fpm/php-fpm.conf @@ -0,0 +1,33 @@ + +[global] + +error_log = /proc/1/fd/2 +daemonize = no + +[www] + +access.log = /proc/1/fd/1 + +user = www-data +group = www-data + +listen = 9000 + +pm = dynamic +pm.max_children = 10 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 5 +pm.max_requests = 500 + +pm.status_path = /fpm-status +ping.path = /fpm-ping + +; Ensure worker stdout and stderr are sent to the main error log. +catch_workers_output = yes + +; php settings +php_admin_value[error_log] = /proc/1/fd/2 +php_admin_value[upload_max_filesize] = 30M +php_admin_value[post_max_size] = 30M +php_admin_flag[log_errors] = on diff --git a/7.2/nginx/Dockerfile b/7.2/nginx/Dockerfile new file mode 100644 index 0000000..6283bcb --- /dev/null +++ b/7.2/nginx/Dockerfile @@ -0,0 +1,24 @@ +# Beware: This file is generated by the generate.sh script! +FROM 25thfloor/php-fpm:7.2 +MAINTAINER 25th-floor GmbH +EXPOSE 80 + +ENV TZ=Europe/Vienna + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \ +&& echo $TZ > /etc/timezone \ +&& dpkg-reconfigure -f noninteractive tzdata \ +&& apt-key adv --fetch-keys http://nginx.org/keys/nginx_signing.key \ +&& echo "deb http://nginx.org/packages/mainline/ubuntu/ `grep -oP 'DISTRIB_CODENAME=\K.*' /etc/lsb-release` nginx" >> /etc/apt/sources.list.d/nginx.list \ +&& cat /etc/apt/sources.list.d/nginx.list \ +&& apt-get update \ +&& apt-get install -y supervisor nginx \ +&& apt-get clean \ +&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ +&& ln -sf /dev/stdout /var/log/nginx/access.log \ +&& ln -sf /dev/stderr /var/log/nginx/error.log + +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY nginx-site.conf /etc/nginx/conf.d/default.conf + +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] diff --git a/7.2/nginx/nginx-site.conf b/7.2/nginx/nginx-site.conf new file mode 100644 index 0000000..3398efe --- /dev/null +++ b/7.2/nginx/nginx-site.conf @@ -0,0 +1,38 @@ +upstream php { + server 127.0.0.1:9000; +} + +server { + listen 80 default_server; + listen [::]:80 default_server ipv6only=on; + + set_real_ip_from 172.0.0.0/8; + real_ip_header X-Forwarded-For; + real_ip_recursive on; + + charset utf-8; + + root /var/www; + index index.php index.html index.htm; + + location / { + try_files $uri $uri/ /index.php?$query_string =404; + } + + location ~ \.php$ { + include fastcgi_params; + + fastcgi_pass php; + fastcgi_index index.php; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_connect_timeout 60; + fastcgi_send_timeout 1200; + fastcgi_read_timeout 1200; + fastcgi_buffer_size 1024k; + fastcgi_buffers 4 1024k; + fastcgi_busy_buffers_size 1024k; + fastcgi_temp_file_write_size 1024k; + fastcgi_intercept_errors on; + } +} diff --git a/7.2/nginx/supervisord.conf b/7.2/nginx/supervisord.conf new file mode 100644 index 0000000..6614df0 --- /dev/null +++ b/7.2/nginx/supervisord.conf @@ -0,0 +1,25 @@ +[supervisord] +nodaemon=true +loglevel=debug +logfile=/proc/1/fd/1 +logfile_maxbytes=0 + +[program:php-fpm] +command=php-fpm7.2 +autostart=true +autorestart=true +redirect_stderr=true +stdout_logfile=/proc/1/fd/1 +stdout_logfile_maxbytes=0 +stderr_logfile=/proc/1/fd/2 +stderr_logfile_maxbytes=0 + +[program:nginx] +command=nginx -g "daemon off;" +autostart=true +autorestart=true +redirect_stderr=true +stdout_logfile=/proc/1/fd/1 +stdout_logfile_maxbytes=0 +stderr_logfile=/proc/1/fd/2 +stderr_logfile_maxbytes=0 diff --git a/7.3/fpm/Dockerfile b/7.3/fpm/Dockerfile new file mode 100644 index 0000000..601e06e --- /dev/null +++ b/7.3/fpm/Dockerfile @@ -0,0 +1,39 @@ +# Beware: This file is generated by the generate.sh script! +FROM ubuntu:16.04 +LABEL authors="25th-floor GmbH" \ + maintainer="devops@25th-floor.com" +EXPOSE 9000 + +ENV DEBIAN_FRONTEND noninteractive +ENV TZ=Europe/Vienna + +RUN apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get install -y software-properties-common language-pack-en-base language-pack-de git unzip \ + && LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php \ + && apt-get update \ + && echo "Package: *\nPin: release o=LP-PPA-ondrej-php5\nPin-Priority: 1001" > /etc/apt/preferences.d/ondrej \ + && apt-get install -y php7.3-fpm php7.3-sqlite3 php7.3-pgsql php7.3-mysql php7.3-mbstring php7.3-intl php7.3-gd php7.3-curl php7.3-xml php7.3-xsl php7.3-xdebug php7.3-zip \ + && apt-get install -y php-pear \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \ + && echo $TZ > /etc/timezone \ + && dpkg-reconfigure -f noninteractive tzdata + +RUN phpenmod -v 7.3 -s ALL sqlite3 pgsql mysql mbstring intl gd curl xml xsl xdebug zip + +# supply but disable xdebug; can be enabled by custom volume-mount ini file +RUN phpdismod -v 7.3 -s ALL xdebug + +# install composer +RUN php7.3 -r 'readfile("https://getcomposer.org/installer");' > composer-setup.php \ + && php7.3 composer-setup.php --install-dir=/usr/local/bin --filename=composer \ + && rm composer-setup.php +RUN composer global require hirak/prestissimo + +ENV PATH="${PATH}:/root/.composer/vendor/bin" + +# Prepare run directory\nRUN mkdir /run/php\n\nWORKDIR /var/www\n\n" >> 7.3/fpm/Dockerfile +COPY php-fpm.conf /etc/php/7.3/fpm/php-fpm.conf +CMD ["php-fpm7.3"] diff --git a/7.3/fpm/php-fpm.conf b/7.3/fpm/php-fpm.conf new file mode 100644 index 0000000..4d7f9d0 --- /dev/null +++ b/7.3/fpm/php-fpm.conf @@ -0,0 +1,33 @@ + +[global] + +error_log = /proc/1/fd/2 +daemonize = no + +[www] + +access.log = /proc/1/fd/1 + +user = www-data +group = www-data + +listen = 9000 + +pm = dynamic +pm.max_children = 10 +pm.start_servers = 3 +pm.min_spare_servers = 2 +pm.max_spare_servers = 5 +pm.max_requests = 500 + +pm.status_path = /fpm-status +ping.path = /fpm-ping + +; Ensure worker stdout and stderr are sent to the main error log. +catch_workers_output = yes + +; php settings +php_admin_value[error_log] = /proc/1/fd/2 +php_admin_value[upload_max_filesize] = 30M +php_admin_value[post_max_size] = 30M +php_admin_flag[log_errors] = on diff --git a/7.3/nginx/Dockerfile b/7.3/nginx/Dockerfile new file mode 100644 index 0000000..f25218a --- /dev/null +++ b/7.3/nginx/Dockerfile @@ -0,0 +1,25 @@ +# Beware: This file is generated by the generate.sh script! +FROM 25thfloor/php-fpm:7.3 +LABEL authors="25th-floor GmbH" \ + maintainer="devops@25th-floor.com" +EXPOSE 80 + +ENV TZ=Europe/Vienna + +RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime \ + && echo $TZ > /etc/timezone \ + && dpkg-reconfigure -f noninteractive tzdata \ + && apt-key adv --fetch-keys http://nginx.org/keys/nginx_signing.key \ + && echo "deb http://nginx.org/packages/mainline/ubuntu/ `grep -oP 'DISTRIB_CODENAME=\K.*' /etc/lsb-release` nginx" >> /etc/apt/sources.list.d/nginx.list \ + && cat /etc/apt/sources.list.d/nginx.list \ + && apt-get update \ + && apt-get install -y supervisor nginx \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && ln -sf /dev/stdout /var/log/nginx/access.log \ + && ln -sf /dev/stderr /var/log/nginx/error.log + +COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf +COPY nginx-site.conf /etc/nginx/conf.d/default.conf + +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] diff --git a/7.3/nginx/nginx-site.conf b/7.3/nginx/nginx-site.conf new file mode 100644 index 0000000..3398efe --- /dev/null +++ b/7.3/nginx/nginx-site.conf @@ -0,0 +1,38 @@ +upstream php { + server 127.0.0.1:9000; +} + +server { + listen 80 default_server; + listen [::]:80 default_server ipv6only=on; + + set_real_ip_from 172.0.0.0/8; + real_ip_header X-Forwarded-For; + real_ip_recursive on; + + charset utf-8; + + root /var/www; + index index.php index.html index.htm; + + location / { + try_files $uri $uri/ /index.php?$query_string =404; + } + + location ~ \.php$ { + include fastcgi_params; + + fastcgi_pass php; + fastcgi_index index.php; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_connect_timeout 60; + fastcgi_send_timeout 1200; + fastcgi_read_timeout 1200; + fastcgi_buffer_size 1024k; + fastcgi_buffers 4 1024k; + fastcgi_busy_buffers_size 1024k; + fastcgi_temp_file_write_size 1024k; + fastcgi_intercept_errors on; + } +} diff --git a/7.3/nginx/supervisord.conf b/7.3/nginx/supervisord.conf new file mode 100644 index 0000000..e06e246 --- /dev/null +++ b/7.3/nginx/supervisord.conf @@ -0,0 +1,25 @@ +[supervisord] +nodaemon=true +loglevel=debug +logfile=/proc/1/fd/1 +logfile_maxbytes=0 + +[program:php-fpm] +command=php-fpm7.3 +autostart=true +autorestart=true +redirect_stderr=true +stdout_logfile=/proc/1/fd/1 +stdout_logfile_maxbytes=0 +stderr_logfile=/proc/1/fd/2 +stderr_logfile_maxbytes=0 + +[program:nginx] +command=nginx -g "daemon off;" +autostart=true +autorestart=true +redirect_stderr=true +stdout_logfile=/proc/1/fd/1 +stdout_logfile_maxbytes=0 +stderr_logfile=/proc/1/fd/2 +stderr_logfile_maxbytes=0 diff --git a/generate.sh b/generate.sh index c051eea..4f14fa7 100755 --- a/generate.sh +++ b/generate.sh @@ -25,7 +25,11 @@ for version in "${versions[@]}"; do package="php${version}-fpm" binary="php-fpm${version}" config="/etc/php/${version}/fpm/php-fpm.conf" - extensions="sqlite3 pgsql mysql mcrypt mbstring intl gd curl xml xsl xdebug zip" + extensions="sqlite3 pgsql mysql mbstring intl gd curl xml xsl xdebug zip" + if [[ ${version} == "5.6" || ${version} == "7.0" || ${version} == "7.1" ]]; then + # mcrypt deprecated in 7.1 and removed in 7.2 (https://secure.php.net/manual/en/migration71.deprecated.php, https://secure.php.net/manual/en/migration72.other-changes.php) + extensions="${extensions} mcrypt" + fi extensionsDisable="xdebug" extensionsPackages="" cliBinary="php${version}" @@ -72,12 +76,13 @@ for version in "${versions[@]}"; do RUN ${cliBinary} -r 'readfile("https://getcomposer.org/installer");' > composer-setup.php \\ && ${cliBinary} composer-setup.php --install-dir=/usr/local/bin --filename=composer \\ && rm composer-setup.php + RUN composer global require hirak/prestissimo + + ENV PATH="\${PATH}:/root/.composer/vendor/bin" - # install phing - RUN export PHP_PEAR_PHP_BIN=${cliBinary} \\ - && pear channel-discover pear.phing.info \\ - && pear install phing/phing + DOCKERFILE + cat <<- DOCKERFILE >> ${file} # Prepare run directory\nRUN mkdir /run/php\n\nWORKDIR /var/www\n\n" >> ${file} COPY php-fpm.conf ${config} CMD ["${binary}"] @@ -124,13 +129,13 @@ for version in "${versions[@]}"; do && ln -sf /dev/stderr /var/log/nginx/error.log COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf - COPY nginx-site.conf /etc/nginx/sites-enabled/default + COPY nginx-site.conf /etc/nginx/conf.d/default.conf CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"] DOCKERFILE # do some code-styling for Dockerfile readability - sed -i '' -e "s|^&&|$(printf '\t')\&\&|g" ${file} + sed -i -e "s|^&&|$(printf '\t')\&\&|g" ${file} cat <<- SUPERVISOR > ${supervisor} [supervisord] diff --git a/push.sh b/push.sh index 4ac85f1..e1572f0 100755 --- a/push.sh +++ b/push.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash -docker tag 25thfloor/php-fpm:7.1 25thfloor/php-fpm:latest -docker tag 25thfloor/php-nginx:7.1 25thfloor/php-nginx:latest +docker tag 25thfloor/php-fpm:7.3 25thfloor/php-fpm:latest +docker tag 25thfloor/php-nginx:7.3 25thfloor/php-nginx:latest docker push 25thfloor/php-nginx docker push 25thfloor/php-fpm