From d368753e807c76648a03d4e91ad55c5f4ee3f69e Mon Sep 17 00:00:00 2001 From: "dave@tiredofit.ca" Date: Wed, 23 Nov 2022 08:01:21 -0800 Subject: [PATCH] Release 7.2.1 - See CHANGELOG.md --- .github/workflows/main.yml | 2 +- .github/workflows/manual.yml | 2 +- CHANGELOG.md | 6 ++++++ Dockerfile | 8 ++++---- Dockerfile.debian | 2 +- README.md | 2 +- 6 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b4063c9..5f8f7a8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -215,7 +215,7 @@ jobs: php8_1_alpine: env: PHP_BASE: "8.1" - DISTRIB: "3.16" + DISTRIB: "3.17" OS: "alpine" runs-on: ubuntu-latest steps: diff --git a/.github/workflows/manual.yml b/.github/workflows/manual.yml index 05a4964..55085f4 100644 --- a/.github/workflows/manual.yml +++ b/.github/workflows/manual.yml @@ -212,7 +212,7 @@ jobs: php8_1_alpine: env: PHP_BASE: "8.1" - DISTRIB: "3.16" + DISTRIB: "3.17" OS: "alpine" runs-on: ubuntu-latest steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 274b5df..d6196b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 7.2.1 2022-11-23 + + ### Changed + - Switch PHP 8.1 base to Alpine 3.17 + + ## 7.2.0 2022-10-13 ### Added diff --git a/Dockerfile b/Dockerfile index 60de9eb..a486b55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -ARG ALPINE_VERSION=3.16 +ARG ALPINE_VERSION=3.17 FROM docker.io/tiredofit/nginx:alpine-${ALPINE_VERSION} LABEL maintainer="Dave Conroy (github.com/tiredofit)" ARG PHP_BASE -ENV PHP_BASE=${PHP_BASE:-"8.0"} \ +ENV PHP_BASE=${PHP_BASE:-"8.1"} \ PHP_ENABLE_APCU=TRUE \ PHP_ENABLE_BCMATH=TRUE \ PHP_ENABLE_BZ2=TRUE \ @@ -702,7 +702,7 @@ RUN if [ "${PHP_BASE}" = "8.1" ] ; then export php_folder="81" ; else php_folde git \ gnupg \ gpgme \ - libressl \ + openssl \ mariadb-client \ postgresql-client \ $(printenv PHP_$(echo ${PHP_BASE} | sed 's|\.|_|g')_RUN_DEPS) \ @@ -744,5 +744,5 @@ RUN if [ "${PHP_BASE}" = "8.1" ] ; then export php_folder="81" ; else php_folde EXPOSE 9000 ### Files Addition -ADD install / +COPY install / diff --git a/Dockerfile.debian b/Dockerfile.debian index e214671..b8d9457 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -187,4 +187,4 @@ RUN export PHP_7_3_RUN_DEPS=" \ EXPOSE 9000 ### Files Addition -ADD install / +COPY install / diff --git a/README.md b/README.md index d060209..915ef7f 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ The following image tags are available along with their tagged release based on | PHP version | Alpine Base | Tag | Debian Base | Tag | | ----------- | ----------- | -------------- | ----------- | ------------- | | latest | edge | `:alpine-edge` | | | -| 8.1.x | 3.16 | `:alpine-8.1` | Buster | `:debian-8.1` | +| 8.1.x | 3.17 | `:alpine-8.1` | Buster | `:debian-8.1` | | 8.0.x | 3.16 | `:alpine-8.0` | Buster | `:debian-8.0` | | 7.4.x | 3.15 | `:alpine-7.4` | Buster | `:debian-7.3` | | 7.3.x | 3.12 | `:alpine-7.3` | Buster | `:debian-7.3` |