From 2371b0a45632dda191dca8377764cac82f86e36f Mon Sep 17 00:00:00 2001 From: Bob Olde Hampsink Date: Tue, 13 Oct 2020 13:30:30 +0200 Subject: [PATCH 1/2] Heroku 20 --- Dockerfile | 16 ++++++++-------- README.md | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 33148df..b448522 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Inherit from Heroku's stack -FROM heroku/heroku:18 +FROM heroku/heroku:20 LABEL maintainer="Bob Olde Hampsink " # Internally, we arbitrarily use port 3000 @@ -24,7 +24,7 @@ WORKDIR /app/user ENV PATH /app/.heroku/php/bin:/app/.heroku/php/sbin:/app/.heroku/node/bin/:/app/user/node_modules/.bin:/app/user/vendor/bin:/app/user/:$PATH # Install Apache -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/apache-$HTTPD_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/apache-$HTTPD_VERSION.tar.gz | tar xz -C /app/.heroku/php # Config RUN curl --silent --location https://raw.githubusercontent.com/heroku/heroku-buildpack-php/master/support/build/_conf/apache2/httpd.conf > /app/.heroku/php/etc/apache2/httpd.conf # FPM socket permissions workaround when run as root @@ -33,7 +33,7 @@ Group root\n\ " >> /app/.heroku/php/etc/apache2/httpd.conf # Install Nginx -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/nginx-$NGINX_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/nginx-$NGINX_VERSION.tar.gz | tar xz -C /app/.heroku/php # Config RUN curl --silent --location https://raw.githubusercontent.com/heroku/heroku-buildpack-php/master/conf/nginx/main.conf > /app/.heroku/php/etc/nginx/nginx.conf # FPM socket permissions workaround when run as root @@ -42,13 +42,13 @@ user nobody root;\n\ " >> /app/.heroku/php/etc/nginx/nginx.conf # Install PHP -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/php-$PHP_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/php-$PHP_VERSION.tar.gz | tar xz -C /app/.heroku/php # Config RUN mkdir -p /app/.heroku/php/etc/php/conf.d RUN curl --silent --location https://raw.githubusercontent.com/heroku/heroku-buildpack-php/master/support/build/_conf/php/7/0/conf.d/000-heroku.ini > /app/.heroku/php/etc/php/php.ini -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20190902/redis-$REDIS_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20190902/imagick-$IMAGICK_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/extensions/no-debug-non-zts-20190902/pcov-$PCOV_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/extensions/no-debug-non-zts-20190902/redis-$REDIS_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/extensions/no-debug-non-zts-20190902/imagick-$IMAGICK_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/extensions/no-debug-non-zts-20190902/pcov-$PCOV_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php # Enable all optional exts RUN echo "\n\ user_ini.cache_ttl = 30 \n\ @@ -74,7 +74,7 @@ extension=xsl.so \n\ " >> /app/.heroku/php/etc/php/php.ini # Install Composer -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-18-stable/composer-$COMPOSER_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/composer-$COMPOSER_VERSION.tar.gz | tar xz -C /app/.heroku/php # Install Node RUN curl --silent --location https://s3pository.heroku.com/node/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar --strip-components=1 -xz -C /app/.heroku/node diff --git a/README.md b/README.md index ea9d33c..1737873 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Usage: `FROM ghcr.io/robuust/heroku-php` # Specifications -* Heroku 18 +* Heroku 20 * Apache * Nginx * PHP 7.4.x with Redis, Imagick and PCov From a331d4c39ee96a14a3357b0783b75069d6ccae10 Mon Sep 17 00:00:00 2001 From: Bob Olde Hampsink Date: Mon, 30 Nov 2020 19:16:02 +0100 Subject: [PATCH 2/2] Use stable versions --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index b448522..1cfa8ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ WORKDIR /app/user ENV PATH /app/.heroku/php/bin:/app/.heroku/php/sbin:/app/.heroku/node/bin/:/app/user/node_modules/.bin:/app/user/vendor/bin:/app/user/:$PATH # Install Apache -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/apache-$HTTPD_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/apache-$HTTPD_VERSION.tar.gz | tar xz -C /app/.heroku/php # Config RUN curl --silent --location https://raw.githubusercontent.com/heroku/heroku-buildpack-php/master/support/build/_conf/apache2/httpd.conf > /app/.heroku/php/etc/apache2/httpd.conf # FPM socket permissions workaround when run as root @@ -33,7 +33,7 @@ Group root\n\ " >> /app/.heroku/php/etc/apache2/httpd.conf # Install Nginx -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/nginx-$NGINX_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/nginx-$NGINX_VERSION.tar.gz | tar xz -C /app/.heroku/php # Config RUN curl --silent --location https://raw.githubusercontent.com/heroku/heroku-buildpack-php/master/conf/nginx/main.conf > /app/.heroku/php/etc/nginx/nginx.conf # FPM socket permissions workaround when run as root @@ -42,13 +42,13 @@ user nobody root;\n\ " >> /app/.heroku/php/etc/nginx/nginx.conf # Install PHP -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/php-$PHP_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/php-$PHP_VERSION.tar.gz | tar xz -C /app/.heroku/php # Config RUN mkdir -p /app/.heroku/php/etc/php/conf.d RUN curl --silent --location https://raw.githubusercontent.com/heroku/heroku-buildpack-php/master/support/build/_conf/php/7/0/conf.d/000-heroku.ini > /app/.heroku/php/etc/php/php.ini -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/extensions/no-debug-non-zts-20190902/redis-$REDIS_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/extensions/no-debug-non-zts-20190902/imagick-$IMAGICK_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/extensions/no-debug-non-zts-20190902/pcov-$PCOV_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/extensions/no-debug-non-zts-20190902/redis-$REDIS_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/extensions/no-debug-non-zts-20190902/imagick-$IMAGICK_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/extensions/no-debug-non-zts-20190902/pcov-$PCOV_EXT_VERSION.tar.gz | tar xz -C /app/.heroku/php # Enable all optional exts RUN echo "\n\ user_ini.cache_ttl = 30 \n\ @@ -74,7 +74,7 @@ extension=xsl.so \n\ " >> /app/.heroku/php/etc/php/php.ini # Install Composer -RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-develop/composer-$COMPOSER_VERSION.tar.gz | tar xz -C /app/.heroku/php +RUN curl --silent --location https://lang-php.s3.amazonaws.com/dist-heroku-20-stable/composer-$COMPOSER_VERSION.tar.gz | tar xz -C /app/.heroku/php # Install Node RUN curl --silent --location https://s3pository.heroku.com/node/v$NODE_VERSION/node-v$NODE_VERSION-linux-x64.tar.gz | tar --strip-components=1 -xz -C /app/.heroku/node