From a307684aba76db2fa915ef30ce6701690acb5ddf Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Thu, 1 Feb 2024 16:51:26 +0100 Subject: [PATCH 1/3] =?UTF-8?q?SC-18357:=20Alpine=203.19=20support.=20Upda?= =?UTF-8?q?te=20NewRelic=20Agent.=20Update=20PHP=20Vers=E2=80=A6=20(#84)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * SC-18357: Alpine 3.19 support. Update NewRelic Agent. Update PHP Version. Update Composer version. * SC-18357: Update NewRelic Agent * Update ReadMe * Update ReadMe --- .github/workflows/ci.yml | 21 +++++++------- README.md | 22 +++++++-------- alpine/3.16/8.0/Dockerfile | 5 ++-- alpine/3.16/8.1/Dockerfile | 6 ++-- alpine/3.16/8.2/Dockerfile | 4 +-- alpine/3.17/8.1/Dockerfile | 6 ++-- alpine/3.17/8.2/Dockerfile | 6 ++-- alpine/3.18/8.1/Dockerfile | 6 ++-- alpine/3.18/8.2/Dockerfile | 6 ++-- alpine/{3.15 => 3.19}/8.1/Dockerfile | 31 ++++++++++++++------ alpine/{3.15/8.0 => 3.19/8.2}/Dockerfile | 36 ++++++++++++++++-------- debian/bullseye/8.0/Dockerfile | 4 +-- debian/bullseye/8.1/Dockerfile | 4 +-- debian/bullseye/8.2/Dockerfile | 4 +-- 14 files changed, 92 insertions(+), 69 deletions(-) rename alpine/{3.15 => 3.19}/8.1/Dockerfile (88%) rename alpine/{3.15/8.0 => 3.19/8.2}/Dockerfile (87%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7977d35a..5c6035b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,15 +10,6 @@ jobs: matrix: include: ## Alpine - - ### Alpine 3.15 - - image: "alpine/3.15/8.0/Dockerfile" - tags: [ "spryker/php:8.0-alpine3.15" ] - platforms: [ "linux/amd64", "linux/arm64" ] - - image: "alpine/3.15/8.1/Dockerfile" - tags: [ "spryker/php:8.1-alpine3.15" ] - platforms: [ "linux/amd64", "linux/arm64" ] - ### Alpine 3.16 - image: "alpine/3.16/8.0/Dockerfile" tags: [ "spryker/php:8.0", "spryker/php:8.0-alpine3.16" ] @@ -40,10 +31,18 @@ jobs: ### Alpine 3.18 - image: "alpine/3.18/8.1/Dockerfile" - tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.18" ] + tags: [ "spryker/php:8.1-alpine3.18" ] platforms: [ "linux/amd64", "linux/arm64" ] - image: "alpine/3.18/8.2/Dockerfile" - tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.18" ] + tags: [ "spryker/php:8.2-alpine3.18" ] + platforms: [ "linux/amd64", "linux/arm64" ] + + ### Alpine 3.19 + - image: "alpine/3.19/8.1/Dockerfile" + tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.19" ] + platforms: [ "linux/amd64", "linux/arm64" ] + - image: "alpine/3.19/8.2/Dockerfile" + tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.19" ] platforms: [ "linux/amd64", "linux/arm64" ] ## Debian diff --git a/README.md b/README.md index 4c5ca574..88400694 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ Extends official PHP Docker images with extensions and tools to be able to run Spryker. * Based on official PHP images - * `Alpine 3.15` * `Alpine 3.16` * `Alpine 3.17` * `Alpine 3.18` + * `Alpine 3.19` * `Debian "bullseye"` * Users: `root`, `spryker` @@ -30,19 +30,19 @@ Extends official PHP Docker images with extensions and tools to be able to run S | Tag | PHP version | Linux distribution | Details | Dockerfile | |:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| -| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.9 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | -| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.9 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | -| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.22 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1.svg)](https://microbadger.com/images/spryker/php:8.1 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.1/Dockerfile) | +| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.15 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) | +| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.15 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) | +| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.27 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1.svg)](https://microbadger.com/images/spryker/php:8.1 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) | | [spryker/php:8.0](https://hub.docker.com/r/spryker/php/tags?name=8.0) | 8.0.28 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.0.svg)](https://microbadger.com/images/spryker/php:8.0 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.0/Dockerfile) | -| [spryker/php:8.2-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.18) | 8.2.9 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | -| [spryker/php:8.1-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.18) | 8.1.22 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.1/Dockerfile) | -| [spryker/php:8.2-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.17) | 8.2.9 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.17/8.2/Dockerfile) | -| [spryker/php:8.1-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.17) | 8.1.22 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.1/Dockerfile) | +| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.15 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) | +| [spryker/php:8.1-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.19) | 8.1.27 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) | +| [spryker/php:8.2-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.18) | 8.2.15 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | +| [spryker/php:8.1-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.18) | 8.1.27 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.1/Dockerfile) | +| [spryker/php:8.2-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.17) | 8.2.13 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.17/8.2/Dockerfile) | +| [spryker/php:8.1-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.17) | 8.1.26 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.1/Dockerfile) | | [spryker/php:8.2-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.16) | 8.2.5 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.2/Dockerfile) | -| [spryker/php:8.1-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.16) | 8.1.22 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.1/Dockerfile) | +| [spryker/php:8.1-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.16) | 8.1.26 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.1/Dockerfile) | | [spryker/php:8.0-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.0-alpine3.16) | 8.0.30 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.0-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.0-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.0/Dockerfile) | -| [spryker/php:8.1-alpine3.15](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.15) | 8.1.13 | Alpine 3.15 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.15.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.15 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.15/8.1/Dockerfile) | -| [spryker/php:8.0-alpine3.15](https://hub.docker.com/r/spryker/php/tags?name=8.0-alpine3.15) | 8.0.26 | Alpine 3.15 | [![](https://images.microbadger.com/badges/image/spryker/php:8.0-alpine3.15.svg)](https://microbadger.com/images/spryker/php:8.0-alpine3.15 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.15/8.0/Dockerfile) | | [spryker/php:8.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.5 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-debian.svg)](https://microbadger.com/images/spryker/php:8.2-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.2/Dockerfile) | | [spryker/php:8.1-debian](https://hub.docker.com/r/spryker/php/tags?name=8.1-debian) | 8.1.18 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-debian.svg)](https://microbadger.com/images/spryker/php:8.1-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.1/Dockerfile) | | [spryker/php:8.0-debian](https://hub.docker.com/r/spryker/php/tags?name=8.0-debian) | 8.0.28 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.0-debian.svg)](https://microbadger.com/images/spryker/php:8.0-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.0/Dockerfile) | diff --git a/alpine/3.16/8.0/Dockerfile b/alpine/3.16/8.0/Dockerfile index 8c17436d..01662f5d 100644 --- a/alpine/3.16/8.0/Dockerfile +++ b/alpine/3.16/8.0/Dockerfile @@ -1,14 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental ARG SPRYKER_PHP_VERSION=8.0.30 -ARG NEWRELIC_VERSION=10.6.0.318 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=80 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.8 ARG TIDEWAYS_PHP_VERSION=8.0 diff --git a/alpine/3.16/8.1/Dockerfile b/alpine/3.16/8.1/Dockerfile index 145cbb71..0078bb43 100644 --- a/alpine/3.16/8.1/Dockerfile +++ b/alpine/3.16/8.1/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.22 +ARG SPRYKER_PHP_VERSION=8.1.26 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.8 ARG TIDEWAYS_PHP_VERSION=8.1 diff --git a/alpine/3.16/8.2/Dockerfile b/alpine/3.16/8.2/Dockerfile index 88664e03..b9bc1652 100644 --- a/alpine/3.16/8.2/Dockerfile +++ b/alpine/3.16/8.2/Dockerfile @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.2.5 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 diff --git a/alpine/3.17/8.1/Dockerfile b/alpine/3.17/8.1/Dockerfile index dec4a810..c3ab5bfd 100644 --- a/alpine/3.17/8.1/Dockerfile +++ b/alpine/3.17/8.1/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.22 +ARG SPRYKER_PHP_VERSION=8.1.26 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.1 diff --git a/alpine/3.17/8.2/Dockerfile b/alpine/3.17/8.2/Dockerfile index 96566502..4bffffe6 100644 --- a/alpine/3.17/8.2/Dockerfile +++ b/alpine/3.17/8.2/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.9 +ARG SPRYKER_PHP_VERSION=8.2.13 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 diff --git a/alpine/3.18/8.1/Dockerfile b/alpine/3.18/8.1/Dockerfile index 4d2d2040..deefc028 100644 --- a/alpine/3.18/8.1/Dockerfile +++ b/alpine/3.18/8.1/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.22 +ARG SPRYKER_PHP_VERSION=8.1.27 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.1 diff --git a/alpine/3.18/8.2/Dockerfile b/alpine/3.18/8.2/Dockerfile index 3784178a..09b741d8 100644 --- a/alpine/3.18/8.2/Dockerfile +++ b/alpine/3.18/8.2/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.9 +ARG SPRYKER_PHP_VERSION=8.2.15 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 diff --git a/alpine/3.15/8.1/Dockerfile b/alpine/3.19/8.1/Dockerfile similarity index 88% rename from alpine/3.15/8.1/Dockerfile rename to alpine/3.19/8.1/Dockerfile index c88600ec..7c915493 100644 --- a/alpine/3.15/8.1/Dockerfile +++ b/alpine/3.19/8.1/Dockerfile @@ -1,14 +1,14 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.13 +ARG SPRYKER_PHP_VERSION=8.1.27 -FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.15 +FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.11.0.3 -ARG TIDEWAYS_VERSION=5.5.8 +ARG NEWRELIC_VERSION=10.16.0.5 +ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.1 ENV srcRoot /data @@ -37,6 +37,7 @@ ARG PHP_BUILD_DEPS="\ freetype-dev \ gmp-dev \ icu-dev \ + icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -70,6 +71,9 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof" +ARG GRAPHVIZ_BUILD_DEPS="\ + expat-dev" + ARG CFLAGS="-I/usr/src/php" RUN apk update \ && apk upgrade \ @@ -79,12 +83,10 @@ RUN apk update \ curl \ g++ \ git \ - graphviz \ make \ mysql-client \ netcat-openbsd \ openssh \ - openssl \ postgresql-client \ procps \ python3 \ @@ -94,6 +96,8 @@ RUN apk update \ ${PHP_RUN_DEPS} \ && \ apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \ + && \ + apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \ && rm -rf /var/lib/apt/lists/ \ && \ docker-php-ext-configure gd \ @@ -133,8 +137,7 @@ RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC && /tmp/newrelic-php5-*/newrelic-install install \ && rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \ && /usr/bin/install -d -m 777 /var/log/newrelic/ \ - && rm /usr/local/etc/php/conf.d/newrelic.ini \ - && ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2' + && rm /usr/local/etc/php/conf.d/newrelic.ini' # Tideways ENV TIDEWAYS_APIKEY='' @@ -150,6 +153,16 @@ RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \ && tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \ && cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' +# GraphViz 7.0.5 +RUN cd /tmp && \ + curl -L https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.gz | tar -zx && \ + cd /tmp/graphviz-7.0.5 && \ + ./configure && \ + make && \ + make install && \ + rm -rf /tmp/graphviz-7.0.5 && \ + apk del --no-cache .graphviz-build-deps + # Opcache RUN /usr/bin/install -d -m 777 /var/run/opcache diff --git a/alpine/3.15/8.0/Dockerfile b/alpine/3.19/8.2/Dockerfile similarity index 87% rename from alpine/3.15/8.0/Dockerfile rename to alpine/3.19/8.2/Dockerfile index 0bf575a3..d788a1a2 100644 --- a/alpine/3.15/8.0/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -1,15 +1,15 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.0.26 +ARG SPRYKER_PHP_VERSION=8.2.15 -FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.15 +FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 -ARG BLACKFIRE_PHP_VERSION=80 -ARG NEWRELIC_VERSION=10.11.0.3 -ARG TIDEWAYS_VERSION=5.5.8 -ARG TIDEWAYS_PHP_VERSION=8.0 +ARG BLACKFIRE_PHP_VERSION=82 +ARG NEWRELIC_VERSION=10.16.0.5 +ARG TIDEWAYS_VERSION=5.5.14 +ARG TIDEWAYS_PHP_VERSION=8.2 ENV srcRoot /data @@ -37,6 +37,7 @@ ARG PHP_BUILD_DEPS="\ freetype-dev \ gmp-dev \ icu-dev \ + icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ @@ -70,6 +71,9 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ xdebug \ xhprof" +ARG GRAPHVIZ_BUILD_DEPS="\ + expat-dev" + ARG CFLAGS="-I/usr/src/php" RUN apk update \ && apk upgrade \ @@ -79,22 +83,21 @@ RUN apk update \ curl \ g++ \ git \ - graphviz \ make \ mysql-client \ netcat-openbsd \ openssh \ - openssl \ postgresql-client \ procps \ python3 \ shadow \ - make \ unzip \ linux-headers \ ${PHP_RUN_DEPS} \ && \ apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \ + && \ + apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \ && rm -rf /var/lib/apt/lists/ \ && \ docker-php-ext-configure gd \ @@ -134,8 +137,7 @@ RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC && /tmp/newrelic-php5-*/newrelic-install install \ && rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \ && /usr/bin/install -d -m 777 /var/log/newrelic/ \ - && rm /usr/local/etc/php/conf.d/newrelic.ini \ - && ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2' + && rm /usr/local/etc/php/conf.d/newrelic.ini' # Tideways ENV TIDEWAYS_APIKEY='' @@ -151,6 +153,16 @@ RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \ && tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \ && cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' +# GraphViz 7.0.5 +RUN cd /tmp && \ + curl -L https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.gz | tar -zx && \ + cd /tmp/graphviz-7.0.5 && \ + ./configure && \ + make && \ + make install && \ + rm -rf /tmp/graphviz-7.0.5 && \ + apk del --no-cache .graphviz-build-deps + # Opcache RUN /usr/bin/install -d -m 777 /var/run/opcache diff --git a/debian/bullseye/8.0/Dockerfile b/debian/bullseye/8.0/Dockerfile index ed15828a..d24b30f0 100644 --- a/debian/bullseye/8.0/Dockerfile +++ b/debian/bullseye/8.0/Dockerfile @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.0.28 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=80 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.8 ARG TIDEWAYS_PHP_VERSION=8.0 ARG GOLANG_VERSION=1.20.3 diff --git a/debian/bullseye/8.1/Dockerfile b/debian/bullseye/8.1/Dockerfile index e64ed430..b50b8553 100644 --- a/debian/bullseye/8.1/Dockerfile +++ b/debian/bullseye/8.1/Dockerfile @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.1.18 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.8 ARG TIDEWAYS_PHP_VERSION=8.1 ARG GOLANG_VERSION=1.20.3 diff --git a/debian/bullseye/8.2/Dockerfile b/debian/bullseye/8.2/Dockerfile index 6b113f8d..c7b0e80e 100644 --- a/debian/bullseye/8.2/Dockerfile +++ b/debian/bullseye/8.2/Dockerfile @@ -4,10 +4,10 @@ ARG SPRYKER_PHP_VERSION=8.2.5 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.4 +ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.11.0.3 +ARG NEWRELIC_VERSION=10.16.0.5 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 ARG GOLANG_VERSION=1.20.3 From 5fc47ff7edc58ae3b63ffdad8e0e86cd79916abf Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Mon, 5 Feb 2024 14:56:53 +0100 Subject: [PATCH 2/3] Fix an issue with INTL extension (#85) * Fix an issue with INTL extension * Update README * Update README --- .github/workflows/ci.yml | 8 ++++---- README.md | 9 +++------ 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c6035b7..236626d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,18 +31,18 @@ jobs: ### Alpine 3.18 - image: "alpine/3.18/8.1/Dockerfile" - tags: [ "spryker/php:8.1-alpine3.18" ] + tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.18" ] platforms: [ "linux/amd64", "linux/arm64" ] - image: "alpine/3.18/8.2/Dockerfile" - tags: [ "spryker/php:8.2-alpine3.18" ] + tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.18" ] platforms: [ "linux/amd64", "linux/arm64" ] ### Alpine 3.19 - image: "alpine/3.19/8.1/Dockerfile" - tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.19" ] + tags: [ "spryker/php:8.1-alpine3.19" ] platforms: [ "linux/amd64", "linux/arm64" ] - image: "alpine/3.19/8.2/Dockerfile" - tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.19" ] + tags: [ "spryker/php:8.2-alpine3.19" ] platforms: [ "linux/amd64", "linux/arm64" ] ## Debian diff --git a/README.md b/README.md index 88400694..e572f3f4 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,6 @@ Extends official PHP Docker images with extensions and tools to be able to run S * `Alpine 3.16` * `Alpine 3.17` * `Alpine 3.18` - * `Alpine 3.19` * `Debian "bullseye"` * Users: `root`, `spryker` @@ -30,12 +29,10 @@ Extends official PHP Docker images with extensions and tools to be able to run S | Tag | PHP version | Linux distribution | Details | Dockerfile | |:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| -| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.15 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) | -| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.15 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) | -| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.27 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1.svg)](https://microbadger.com/images/spryker/php:8.1 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) | +| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.15 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | +| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.15 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | +| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.27 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1.svg)](https://microbadger.com/images/spryker/php:8.1 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.1/Dockerfile) | | [spryker/php:8.0](https://hub.docker.com/r/spryker/php/tags?name=8.0) | 8.0.28 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.0.svg)](https://microbadger.com/images/spryker/php:8.0 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.0/Dockerfile) | -| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.15 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) | -| [spryker/php:8.1-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.19) | 8.1.27 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) | | [spryker/php:8.2-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.18) | 8.2.15 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) | | [spryker/php:8.1-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.18) | 8.1.27 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.1/Dockerfile) | | [spryker/php:8.2-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.17) | 8.2.13 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.17/8.2/Dockerfile) | From aeebd99302d7dc3bd18b24aaf6b03ba6301220c0 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Tue, 6 Feb 2024 21:24:01 +0100 Subject: [PATCH 3/3] Enable FTP extension for PHP 8.2.15 (#87) --- .DS_Store | Bin 0 -> 6148 bytes alpine/3.18/8.2/Dockerfile | 1 + alpine/3.19/8.2/Dockerfile | 1 + 3 files changed, 2 insertions(+) create mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0b0222d37a9678bc3b422ca95f9ed9d1044e8923 GIT binary patch literal 6148 zcmeHLy-EW?5S}$rqd~N=u#zk61T|KoJr2 z5iEQFOJBf3@SEM$?B3-pMZym3es?poyWf3#x0?+SiQ-8;M>Iu585G9!II2FzaV{|% z(w-Th;6B>TT)7r>y0J{>a0)mD{-Xl??WSpgnsh+N*7uv8oHJvcpj4{1gDQNPy}S4I zmEGqJJ6``a-fbCc!#uAyH2OU*wdjPZ*61{`70)m^)Lw4ymlcOdKb@e*Bst6CBiBC~ z2A>0}Q-dltm+5P8F`_1q?az;FLGiFMdK~&^*yGD3bA&3?rY<-fQp09&Qvd@iZgLP0 zV>_!P=OdESW090&@em${!MxNc0Ec5JaT<9m#Oz``!{m}*%P;A7BhrsKFUeUppDX4w zBIl$ET`F{F>vH}YjhkGKF5gmT7f<}2T78&Il5#8_^oTA7&ah{*WwHug?G$hdI0b$b z;Pt^nVe~bI3gyy)N*)1#X}G1~TJG&Yj~zf?W2g`wm{3iDs;SUN456CC@98{WW2jIy zCm}~hKYC=LPbfl;4!