SC-18357: Alpine 3.19 support. Update NewRelic Agent. Update PHP Vers…

…ion. Update Composer version.
spryker · Jan 31, 2024 · 0dd372e · 0dd372e
1 parent 7dc9717
commit 0dd372e
Show file tree

Hide file tree

Showing 13 changed files with 79 additions and 54 deletions.
diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 → alpine/3.19/8.1/Dockerfile b/alpine/3.15/8.1/Dockerfile → 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 \
@@ -150,6 +154,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 → alpine/3.19/8.2/Dockerfile b/alpine/3.15/8.0/Dockerfile → 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 \
@@ -151,6 +154,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
@@ -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
@@ -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
@@ -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