From 82f965ebf87db38d22c0ae72f947ee6ac79e780a Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Thu, 4 Jul 2024 09:17:07 +0200 Subject: [PATCH 1/8] Update PHP Version. Introduce Alpine 3.20. ReadME update (#92) * Update PHP Version. Introduce Alpine 3.20. ReadME update * Update README.md * Update NewRelic version --- .github/workflows/ci.yml | 19 ++- README.md | 25 ++-- alpine/3.16/8.0/Dockerfile | 187 --------------------------- alpine/3.17/8.1/Dockerfile | 2 +- alpine/3.17/8.2/Dockerfile | 2 +- alpine/3.18/8.1/Dockerfile | 2 +- alpine/3.18/8.2/Dockerfile | 4 +- alpine/3.19/8.1/Dockerfile | 4 +- alpine/3.19/8.2/Dockerfile | 4 +- alpine/{3.16 => 3.20}/8.1/Dockerfile | 28 ++-- alpine/{3.16 => 3.20}/8.2/Dockerfile | 26 +++- debian/bullseye/8.0/Dockerfile | 2 +- debian/bullseye/8.1/Dockerfile | 4 +- debian/bullseye/8.2/Dockerfile | 4 +- 14 files changed, 75 insertions(+), 238 deletions(-) delete mode 100644 alpine/3.16/8.0/Dockerfile rename alpine/{3.16 => 3.20}/8.1/Dockerfile (88%) rename alpine/{3.16 => 3.20}/8.2/Dockerfile (89%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5c6035b7..6a9e0704 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,17 +10,6 @@ jobs: matrix: include: ## Alpine - ### Alpine 3.16 - - image: "alpine/3.16/8.0/Dockerfile" - tags: [ "spryker/php:8.0", "spryker/php:8.0-alpine3.16" ] - platforms: [ "linux/amd64", "linux/arm64" ] - - image: "alpine/3.16/8.1/Dockerfile" - tags: [ "spryker/php:8.1-alpine3.16" ] - platforms: [ "linux/amd64", "linux/arm64" ] - - image: "alpine/3.16/8.2/Dockerfile" - tags: [ "spryker/php:8.2-alpine3.16" ] - platforms: [ "linux/amd64", "linux/arm64" ] - ### Alpine 3.17 - image: "alpine/3.17/8.1/Dockerfile" tags: [ "spryker/php:8.1-alpine3.17" ] @@ -45,6 +34,14 @@ jobs: tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.19" ] platforms: [ "linux/amd64", "linux/arm64" ] + ### Alpine 3.20 + - image: "alpine/3.20/8.1/Dockerfile" + tags: [ "spryker/php:8.1-alpine3.20" ] + platforms: [ "linux/amd64", "linux/arm64" ] + - image: "alpine/3.20/8.2/Dockerfile" + tags: [ "spryker/php:8.2-alpine3.20" ] + platforms: [ "linux/amd64", "linux/arm64" ] + ## Debian ### Debian bullseye - image: "debian/bullseye/8.0/Dockerfile" diff --git a/README.md b/README.md index 98cf02ca..2b81d64c 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.16` * `Alpine 3.17` * `Alpine 3.18` * `Alpine 3.19` + * `Alpine 3.20` * `Debian "bullseye"` * Users: `root`, `spryker` @@ -28,20 +28,21 @@ Extends official PHP Docker images with extensions and tools to be able to run S ## Tags -| Tag | PHP version | Linux distribution | Details | Dockerfile | -|:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------| -| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.18 | 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.18 | 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.28 | 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.18 | 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) | +| Tag | PHP version | Linux distribution | Details | Dockerfile | +|:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------| +| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.20 | 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.20 | 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.29 | 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.2-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.20) | 8.2.20 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.2/Dockerfile) | +| [spryker/php:8.1-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.1/Dockerfile) | +| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.20 | 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.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | 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.19 | 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.28 | 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.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.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.18 | 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.28 | 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.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.20 | 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.29 | 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.30 | 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) | ## How to use diff --git a/alpine/3.16/8.0/Dockerfile b/alpine/3.16/8.0/Dockerfile deleted file mode 100644 index 01662f5d..00000000 --- a/alpine/3.16/8.0/Dockerfile +++ /dev/null @@ -1,187 +0,0 @@ -# syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.0.30 - -FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16 - -ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 -ARG BLACKFIRE_VERSION=1.87.1 -ARG BLACKFIRE_PHP_VERSION=80 -ARG NEWRELIC_VERSION=10.16.0.5 -ARG TIDEWAYS_VERSION=5.5.8 -ARG TIDEWAYS_PHP_VERSION=8.0 - -ENV srcRoot /data - -RUN mkdir -p ${srcRoot} - -ARG PHP_RUN_DEPS="\ - freetype \ - gmp \ - gnu-libiconv \ - icu-libs \ - libbz2 \ - libc6-compat \ - libjpeg-turbo \ - libpng \ - libwebp \ - libxml2 \ - libxpm \ - libxslt \ - libzip" - - -ARG PHP_BUILD_DEPS="\ - autoconf \ - bzip2-dev \ - freetype-dev \ - gmp-dev \ - icu-dev \ - icu-data-full \ - libjpeg-turbo-dev \ - libpng-dev \ - libwebp-dev \ - libxml2-dev \ - libxpm-dev \ - libzip-dev \ - postgresql-dev" - -ARG PHP_EXTENSIONS="\ - bcmath \ - bz2 \ - gd \ - gmp \ - intl \ - mysqli \ - opcache \ - pcntl \ - pdo_mysql \ - pdo_pgsql \ - pgsql \ - soap \ - sockets \ - zip" - -ARG PHP_PECL_EXTENSIONS="\ - apcu \ - redis" - -ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ - pcov \ - xdebug \ - xhprof" - -ARG CFLAGS="-I/usr/src/php" -RUN apk update \ - && apk upgrade \ - && apk add --no-cache \ - bash \ - coreutils \ - curl \ - g++ \ - git \ - graphviz \ - make \ - mysql-client \ - netcat-openbsd \ - openssh \ - openssl \ - postgresql-client \ - procps \ - python3 \ - shadow \ - unzip \ - linux-headers \ - ${PHP_RUN_DEPS} \ - && \ - apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \ - && rm -rf /var/lib/apt/lists/ \ - && \ - docker-php-ext-configure gd \ - --disable-gd-jis-conv \ - --with-freetype=/usr \ - --with-jpeg=/usr \ - --with-webp=/usr \ - --with-xpm=/usr \ - && docker-php-ext-install -j5 ${PHP_EXTENSIONS} \ - && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ - && rm -rf /tmp/pear \ - && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps - -# Related to https://github.com/docker-library/php/issues/240 -ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so - -# Blackfire -ENV BLACKFIRE_AGENT_SOCKET='' -RUN architecture=$(case ${TARGETPLATFORM} in "linux/amd64") echo "amd64" ;; linux/arm64) echo "arm64" ;; *) echo "amd64" ;; esac) \ - && curl -A "Docker" -o /tmp/blackfire.so -D - -L -s https://packages.blackfire.io/binaries/blackfire-php/${BLACKFIRE_VERSION}/blackfire-php-alpine_${architecture}-php-${BLACKFIRE_PHP_VERSION}.so \ - && mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so - -# New Relic -ENV NEWRELIC_ENABLED=0 -ENV NEWRELIC_LICENSE='' -ENV NEWRELIC_APPNAME='Spryker' -ENV NEWRELIC_DISTRIBUTED_TRACING_ENABLED=0 -ENV NEWRELIC_TRANSACTION_TRACER_ENABLED=0 -ENV NEWRELIC_SPAN_EVENTS_ENABLED=0 -ENV NEWRELIC_TRANSACTION_TRACER_THRESHOLD=0 -ENV NEWRELIC_DISTRIBUTED_TRACING_EXCLUDE_NEWRELIC_HEADER=0 - -RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux-musl.tar.gz" | tar -C /tmp -zx \ - && export NR_INSTALL_USE_CP_NOT_LN=1 \ - && export NR_INSTALL_SILENT=1 \ - && /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' - -# Tideways -ENV TIDEWAYS_APIKEY='' -ENV TIDEWAYS_DAEMON_URI='' -ENV TIDEWAYS_CLI_ENABLED=0 -RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/amd64" ]; then \ - wget https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-alpine.tar.gz \ - && tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine.tar.gz \ - && cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' - -RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \ - wget https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \ - && 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' - -# Opcache -RUN /usr/bin/install -d -m 777 /var/run/opcache - -# Remove default FPM pool -RUN rm /usr/local/etc/php-fpm.d/www.conf && \ - rm /usr/local/etc/php-fpm.d/docker.conf && \ - rm /usr/local/etc/php-fpm.d/zz-docker.conf - -# Add FPM configs -COPY context/php/php-fpm.d/worker.conf /usr/local/etc/php-fpm.d/worker.conf -COPY context/php/php-fpm.conf /usr/local/etc/php-fpm.conf - -# Copy php.ini configuration -COPY context/php/php.ini /usr/local/etc/php/ -COPY context/php/conf.d/90-opcache.ini /usr/local/etc/php/conf.d/ -COPY context/php/conf.d/92-session.ini /usr/local/etc/php/conf.d/ -COPY context/php/disabled /usr/local/etc/php/disabled - -WORKDIR /data - -# Install composer -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer --version=${COMPOSER_VERSION} - -# Create application user 'spryker' -RUN addgroup spryker && \ - adduser -h /home/spryker -s /bin/sh -G www-data -D spryker && \ - chown spryker:spryker ${srcRoot} - -USER spryker -ENV COMPOSER_MEMORY_LIMIT=-1 -RUN mkdir -p /home/spryker/.composer -RUN bash -c '[[ $COMPOSER_VERSION == "1"* ]] && composer global require hirak/prestissimo && rm -rf /home/spryker/.composer/cache || true' - -USER root diff --git a/alpine/3.17/8.1/Dockerfile b/alpine/3.17/8.1/Dockerfile index c3ab5bfd..ad6b86af 100644 --- a/alpine/3.17/8.1/Dockerfile +++ b/alpine/3.17/8.1/Dockerfile @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 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 4bffffe6..09497e94 100644 --- a/alpine/3.17/8.2/Dockerfile +++ b/alpine/3.17/8.2/Dockerfile @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 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 2fcec3fe..ef120b41 100644 --- a/alpine/3.18/8.1/Dockerfile +++ b/alpine/3.18/8.1/Dockerfile @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 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 ab828cbc..263ccaa8 100644 --- a/alpine/3.18/8.2/Dockerfile +++ b/alpine/3.18/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.18 +ARG SPRYKER_PHP_VERSION=8.2.19 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18 @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 diff --git a/alpine/3.19/8.1/Dockerfile b/alpine/3.19/8.1/Dockerfile index 6372bc88..8160b679 100644 --- a/alpine/3.19/8.1/Dockerfile +++ b/alpine/3.19/8.1/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.28 +ARG SPRYKER_PHP_VERSION=8.1.29 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.1 diff --git a/alpine/3.19/8.2/Dockerfile b/alpine/3.19/8.2/Dockerfile index e8ca2c14..bf2ff163 100644 --- a/alpine/3.19/8.2/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.18 +ARG SPRYKER_PHP_VERSION=8.2.20 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 diff --git a/alpine/3.16/8.1/Dockerfile b/alpine/3.20/8.1/Dockerfile similarity index 88% rename from alpine/3.16/8.1/Dockerfile rename to alpine/3.20/8.1/Dockerfile index 0078bb43..454e80b5 100644 --- a/alpine/3.16/8.1/Dockerfile +++ b/alpine/3.20/8.1/Dockerfile @@ -1,14 +1,14 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.26 +ARG SPRYKER_PHP_VERSION=8.1.29 -FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16 +FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20 ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.16.0.5 -ARG TIDEWAYS_VERSION=5.5.8 +ARG NEWRELIC_VERSION=10.22.0.12 +ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.1 ENV srcRoot /data @@ -71,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 \ @@ -80,12 +83,10 @@ RUN apk update \ curl \ g++ \ git \ - graphviz \ make \ mysql-client \ netcat-openbsd \ openssh \ - openssl \ postgresql-client \ procps \ python3 \ @@ -95,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 \ @@ -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/alpine/3.16/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile similarity index 89% rename from alpine/3.16/8.2/Dockerfile rename to alpine/3.20/8.2/Dockerfile index b9bc1652..b37a6f91 100644 --- a/alpine/3.16/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -1,13 +1,13 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.5 +ARG SPRYKER_PHP_VERSION=8.2.20 -FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16 +FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20 ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 @@ -49,6 +49,7 @@ ARG PHP_BUILD_DEPS="\ ARG PHP_EXTENSIONS="\ bcmath \ bz2 \ + ftp \ gd \ gmp \ intl \ @@ -71,6 +72,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 \ @@ -80,7 +84,6 @@ RUN apk update \ curl \ g++ \ git \ - graphviz \ make \ mysql-client \ netcat-openbsd \ @@ -94,6 +97,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 +138,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 +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 index 374f64c5..9bfbfd07 100644 --- a/debian/bullseye/8.0/Dockerfile +++ b/debian/bullseye/8.0/Dockerfile @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=80 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 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 75a794f5..277d099e 100644 --- a/debian/bullseye/8.1/Dockerfile +++ b/debian/bullseye/8.1/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.28 +ARG SPRYKER_PHP_VERSION=8.1.29 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 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 5c4e36fb..bd55166c 100644 --- a/debian/bullseye/8.2/Dockerfile +++ b/debian/bullseye/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.18 +ARG SPRYKER_PHP_VERSION=8.2.20 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye @@ -7,7 +7,7 @@ ARG TARGETPLATFORM ARG COMPOSER_VERSION=2.6.6 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 -ARG NEWRELIC_VERSION=10.16.0.5 +ARG NEWRELIC_VERSION=10.22.0.12 ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 ARG GOLANG_VERSION=1.20.3 From 41e5d12ad6098254093f31a9770936230ee69ac2 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Mon, 8 Jul 2024 17:37:46 +0200 Subject: [PATCH 2/8] Hotfix. Alpine 3.19 && Alpine 3.20, ICU incompatibility issue. (#93) * Update PHP Version. Introduce Alpine 3.20. ReadME update * Update README.md * Update NewRelic version * Hotfix. ICU incompatible for Alpine 3.19 && 3.20 --- alpine/3.19/8.1/Dockerfile | 31 ++++++++++++++++++------------- alpine/3.19/8.2/Dockerfile | 28 +++++++++++++++++----------- alpine/3.20/8.1/Dockerfile | 28 +++++++++++++++++----------- alpine/3.20/8.2/Dockerfile | 28 +++++++++++++++++----------- 4 files changed, 69 insertions(+), 46 deletions(-) diff --git a/alpine/3.19/8.1/Dockerfile b/alpine/3.19/8.1/Dockerfile index 8160b679..75395a13 100644 --- a/alpine/3.19/8.1/Dockerfile +++ b/alpine/3.19/8.1/Dockerfile @@ -15,11 +15,19 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} +# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ + && apk update \ + && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/community" >> /etc/apk/repositories \ + && apk update + ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ - icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -30,21 +38,19 @@ ARG PHP_RUN_DEPS="\ libxslt \ libzip" - ARG PHP_BUILD_DEPS="\ autoconf \ bzip2-dev \ freetype-dev \ gmp-dev \ - icu-dev \ - icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + build-base" ARG PHP_EXTENSIONS="\ bcmath \ @@ -93,24 +99,23 @@ RUN apk update \ shadow \ unzip \ linux-headers \ + libstdc++ \ + gcompat \ ${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} \ + && 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 \ + && docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ --with-webp=/usr \ --with-xpm=/usr \ - && docker-php-ext-install -j5 ${PHP_EXTENSIONS} \ + && docker-php-ext-install -j$(nproc) ${PHP_EXTENSIONS} \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps + && apk del --no-cache .php-build-deps build-base # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so diff --git a/alpine/3.19/8.2/Dockerfile b/alpine/3.19/8.2/Dockerfile index bf2ff163..4fb651b1 100644 --- a/alpine/3.19/8.2/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -15,11 +15,19 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} +# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ + && apk update \ + && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/community" >> /etc/apk/repositories \ + && apk update + ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ - icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -36,15 +44,14 @@ ARG PHP_BUILD_DEPS="\ bzip2-dev \ freetype-dev \ gmp-dev \ - icu-dev \ - icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + build-base" ARG PHP_EXTENSIONS="\ bcmath \ @@ -94,14 +101,13 @@ RUN apk update \ shadow \ unzip \ linux-headers \ + libstdc++ \ + gcompat \ ${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} \ + && 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 \ + && docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ @@ -111,7 +117,7 @@ RUN apk update \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps + && apk del --no-cache .php-build-deps build-base # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so diff --git a/alpine/3.20/8.1/Dockerfile b/alpine/3.20/8.1/Dockerfile index 454e80b5..75b0cbb7 100644 --- a/alpine/3.20/8.1/Dockerfile +++ b/alpine/3.20/8.1/Dockerfile @@ -15,11 +15,19 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} +# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ + && apk update \ + && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" >> /etc/apk/repositories \ + && apk update + ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ - icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -36,15 +44,14 @@ ARG PHP_BUILD_DEPS="\ bzip2-dev \ freetype-dev \ gmp-dev \ - icu-dev \ - icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + build-base" ARG PHP_EXTENSIONS="\ bcmath \ @@ -93,14 +100,13 @@ RUN apk update \ shadow \ unzip \ linux-headers \ + libstdc++ \ + gcompat \ ${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} \ + && 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 \ + && docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ @@ -110,7 +116,7 @@ RUN apk update \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps + && apk del --no-cache .php-build-deps build-base # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so diff --git a/alpine/3.20/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile index b37a6f91..3d3c33a5 100644 --- a/alpine/3.20/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -15,11 +15,19 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} +# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions +RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ + && apk update \ + && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" > /etc/apk/repositories \ + && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" >> /etc/apk/repositories \ + && apk update + ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ - icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -36,15 +44,14 @@ ARG PHP_BUILD_DEPS="\ bzip2-dev \ freetype-dev \ gmp-dev \ - icu-dev \ - icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + build-base" ARG PHP_EXTENSIONS="\ bcmath \ @@ -94,14 +101,13 @@ RUN apk update \ shadow \ unzip \ linux-headers \ + libstdc++ \ + gcompat \ ${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} \ + && 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 \ + && docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ @@ -111,7 +117,7 @@ RUN apk update \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps + && apk del --no-cache .php-build-deps build-base # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so From 30d043fbd37b0792756f5246151ad0b5863d5a31 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Mon, 8 Jul 2024 21:42:43 +0200 Subject: [PATCH 3/8] Revert "Hotfix. Alpine 3.19 && Alpine 3.20, ICU incompatibility issue." (#95) * Revert "Hotfix. Alpine 3.19 && Alpine 3.20, ICU incompatibility issue. (#93)" This reverts commit 41e5d12ad6098254093f31a9770936230ee69ac2. * Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- alpine/3.19/8.1/Dockerfile | 31 +++++++++++++------------------ alpine/3.19/8.2/Dockerfile | 28 +++++++++++----------------- alpine/3.20/8.1/Dockerfile | 28 +++++++++++----------------- alpine/3.20/8.2/Dockerfile | 28 +++++++++++----------------- 5 files changed, 50 insertions(+), 73 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a9e0704..2d19db2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,18 +20,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" ] ### Alpine 3.20 diff --git a/alpine/3.19/8.1/Dockerfile b/alpine/3.19/8.1/Dockerfile index 75395a13..8160b679 100644 --- a/alpine/3.19/8.1/Dockerfile +++ b/alpine/3.19/8.1/Dockerfile @@ -15,19 +15,11 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} -# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions -RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ - && apk update \ - && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/community" >> /etc/apk/repositories \ - && apk update - ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ + icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -38,19 +30,21 @@ ARG PHP_RUN_DEPS="\ libxslt \ libzip" + ARG PHP_BUILD_DEPS="\ autoconf \ bzip2-dev \ freetype-dev \ gmp-dev \ + icu-dev \ + icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev \ - build-base" + postgresql-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -99,23 +93,24 @@ RUN apk update \ shadow \ unzip \ linux-headers \ - libstdc++ \ - gcompat \ ${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} \ + && \ + 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 \ + && \ + docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ --with-webp=/usr \ --with-xpm=/usr \ - && docker-php-ext-install -j$(nproc) ${PHP_EXTENSIONS} \ + && docker-php-ext-install -j5 ${PHP_EXTENSIONS} \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps build-base + && apk del --no-cache .php-build-deps # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so diff --git a/alpine/3.19/8.2/Dockerfile b/alpine/3.19/8.2/Dockerfile index 4fb651b1..bf2ff163 100644 --- a/alpine/3.19/8.2/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -15,19 +15,11 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} -# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions -RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ - && apk update \ - && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.19/community" >> /etc/apk/repositories \ - && apk update - ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ + icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -44,14 +36,15 @@ ARG PHP_BUILD_DEPS="\ bzip2-dev \ freetype-dev \ gmp-dev \ + icu-dev \ + icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev \ - build-base" + postgresql-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -101,13 +94,14 @@ RUN apk update \ shadow \ unzip \ linux-headers \ - libstdc++ \ - gcompat \ ${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} \ + && \ + 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 \ + && \ + docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ @@ -117,7 +111,7 @@ RUN apk update \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps build-base + && apk del --no-cache .php-build-deps # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so diff --git a/alpine/3.20/8.1/Dockerfile b/alpine/3.20/8.1/Dockerfile index 75b0cbb7..454e80b5 100644 --- a/alpine/3.20/8.1/Dockerfile +++ b/alpine/3.20/8.1/Dockerfile @@ -15,19 +15,11 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} -# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions -RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ - && apk update \ - && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" >> /etc/apk/repositories \ - && apk update - ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ + icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -44,14 +36,15 @@ ARG PHP_BUILD_DEPS="\ bzip2-dev \ freetype-dev \ gmp-dev \ + icu-dev \ + icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev \ - build-base" + postgresql-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -100,13 +93,14 @@ RUN apk update \ shadow \ unzip \ linux-headers \ - libstdc++ \ - gcompat \ ${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} \ + && \ + 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 \ + && \ + docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ @@ -116,7 +110,7 @@ RUN apk update \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps build-base + && apk del --no-cache .php-build-deps # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so diff --git a/alpine/3.20/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile index 3d3c33a5..b37a6f91 100644 --- a/alpine/3.20/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -15,19 +15,11 @@ ENV srcRoot /data RUN mkdir -p ${srcRoot} -# Temporarily use Alpine 3.18 repositories to fetch specific ICU package versions -RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \ - && apk update \ - && apk add --no-cache icu-libs=73.2-r2 icu-dev=73.2-r2 icu-data-full=73.2-r2 \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" > /etc/apk/repositories \ - && echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" >> /etc/apk/repositories \ - && apk update - ARG PHP_RUN_DEPS="\ freetype \ gmp \ gnu-libiconv \ + icu-libs \ libbz2 \ libc6-compat \ libjpeg-turbo \ @@ -44,14 +36,15 @@ ARG PHP_BUILD_DEPS="\ bzip2-dev \ freetype-dev \ gmp-dev \ + icu-dev \ + icu-data-full \ libjpeg-turbo-dev \ libpng-dev \ libwebp-dev \ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev \ - build-base" + postgresql-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -101,13 +94,14 @@ RUN apk update \ shadow \ unzip \ linux-headers \ - libstdc++ \ - gcompat \ ${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} \ + && \ + 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 \ + && \ + docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ @@ -117,7 +111,7 @@ RUN apk update \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ && docker-php-ext-enable ${PHP_EXTENSIONS} ${PHP_PECL_EXTENSIONS} \ - && apk del --no-cache .php-build-deps build-base + && apk del --no-cache .php-build-deps # Related to https://github.com/docker-library/php/issues/240 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so From 27ac4bfcd54a41ca9951a3ec71f474ce21446b34 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Tue, 13 Aug 2024 11:42:52 +0200 Subject: [PATCH 4/8] Update PHP 8.2.20 to PHP 8.2.22 (#97) * Update PHP 8.2.20 to PHP 8.2.22 * Update README.md * Update README.md --- README.md | 12 ++++++------ alpine/3.19/8.2/Dockerfile | 2 +- alpine/3.20/8.2/Dockerfile | 2 +- debian/bullseye/8.2/Dockerfile | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 2b81d64c..fd9acf6c 100644 --- a/README.md +++ b/README.md @@ -30,18 +30,18 @@ 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.20 | 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.20 | 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.29 | 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.2-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.20) | 8.2.20 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.2/Dockerfile) | +| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.20 | 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.19/8.2/Dockerfile) | +| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.20 | 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.19/8.2/Dockerfile) | +| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.29 | 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.19/8.1/Dockerfile) | +| [spryker/php:8.2-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.20) | 8.2.22 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.2/Dockerfile) | | [spryker/php:8.1-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.1/Dockerfile) | -| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.20 | 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.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.22 | 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.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | 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.19 | 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.28 | 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-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.20 | 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.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.22 | 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.29 | 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.30 | 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) | ## How to use diff --git a/alpine/3.19/8.2/Dockerfile b/alpine/3.19/8.2/Dockerfile index bf2ff163..415a4d89 100644 --- a/alpine/3.19/8.2/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.20 +ARG SPRYKER_PHP_VERSION=8.2.22 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 diff --git a/alpine/3.20/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile index b37a6f91..0acc692c 100644 --- a/alpine/3.20/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.20 +ARG SPRYKER_PHP_VERSION=8.2.22 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20 diff --git a/debian/bullseye/8.2/Dockerfile b/debian/bullseye/8.2/Dockerfile index bd55166c..0f5ffe9d 100644 --- a/debian/bullseye/8.2/Dockerfile +++ b/debian/bullseye/8.2/Dockerfile @@ -1,5 +1,5 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.20 +ARG SPRYKER_PHP_VERSION=8.2.22 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye From 9ee362fc494634b504ee48a20ed81012c3a35c76 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Tue, 13 Aug 2024 11:44:53 +0200 Subject: [PATCH 5/8] PHP-AMQP Extension (#96) * PHP-AMQP Extension * Update Debian image * Update Dockerfile --- alpine/.DS_Store | Bin 0 -> 6148 bytes alpine/3.17/8.1/Dockerfile | 10 +++++---- alpine/3.17/8.2/Dockerfile | 10 +++++---- alpine/3.18/8.1/Dockerfile | 10 +++++---- alpine/3.18/8.2/Dockerfile | 10 +++++---- alpine/3.19/8.1/Dockerfile | 10 +++++---- alpine/3.19/8.2/Dockerfile | 10 +++++---- alpine/3.20/8.1/Dockerfile | 10 +++++---- alpine/3.20/8.2/Dockerfile | 10 +++++---- context/php/disabled/amqp.ini | 1 + debian/bullseye/8.0/Dockerfile | 7 ++++--- debian/bullseye/8.1/Dockerfile | 7 ++++--- debian/bullseye/8.2/Dockerfile | 37 +++++++++++++++++---------------- 13 files changed, 76 insertions(+), 56 deletions(-) create mode 100644 alpine/.DS_Store create mode 100644 context/php/disabled/amqp.ini diff --git a/alpine/.DS_Store b/alpine/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5f473a8410ebfa520481427c66ea28a91a6eda8b GIT binary patch literal 6148 zcmeHKu}Z{15S=}*hzN3}ohb$3yr|$^p{!^8f@>}0JUELBxk4MOl!}NyAz0f9*7_U% zfZrg#*elf~bO)hs_r%j3__}WoFZVaEfiCz`w~lYr-KAcm zE;wKJYwPjsw)au`Z1_^Qj<3;WuO-9*aX=jK9YD|Kh}JC1EDneR;=sZI{yxMQjM`yg z(R?~EnJoaYjkF0I^DiaW#16H?!Xg-ivZX*dD#w@y1OEZTBXZu6m>vT{2V zWz=!~*eoZdEy^qohy$SmEB3U*{r|Li{~s2~nK&R0{3{1kI~}D%+>-09m7C*U8)KYf qaPYdq;-UlxrWIo?x8e;96UfJW0Mrf(i^w44N5I%1lQ{6J4*UQ)n{ELB literal 0 HcmV?d00001 diff --git a/alpine/3.17/8.1/Dockerfile b/alpine/3.17/8.1/Dockerfile index ad6b86af..f2b3e83a 100644 --- a/alpine/3.17/8.1/Dockerfile +++ b/alpine/3.17/8.1/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -69,7 +70,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG CFLAGS="-I/usr/src/php" RUN apk update \ diff --git a/alpine/3.17/8.2/Dockerfile b/alpine/3.17/8.2/Dockerfile index 09497e94..3643b451 100644 --- a/alpine/3.17/8.2/Dockerfile +++ b/alpine/3.17/8.2/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -69,7 +70,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG CFLAGS="-I/usr/src/php" RUN apk update \ diff --git a/alpine/3.18/8.1/Dockerfile b/alpine/3.18/8.1/Dockerfile index ef120b41..034b7f70 100644 --- a/alpine/3.18/8.1/Dockerfile +++ b/alpine/3.18/8.1/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -69,7 +70,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.18/8.2/Dockerfile b/alpine/3.18/8.2/Dockerfile index 263ccaa8..91e07bc0 100644 --- a/alpine/3.18/8.2/Dockerfile +++ b/alpine/3.18/8.2/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -70,7 +71,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.19/8.1/Dockerfile b/alpine/3.19/8.1/Dockerfile index 8160b679..3d613ff4 100644 --- a/alpine/3.19/8.1/Dockerfile +++ b/alpine/3.19/8.1/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev " ARG PHP_EXTENSIONS="\ bcmath \ @@ -69,7 +70,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.19/8.2/Dockerfile b/alpine/3.19/8.2/Dockerfile index 415a4d89..7e932414 100644 --- a/alpine/3.19/8.2/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -70,7 +71,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.20/8.1/Dockerfile b/alpine/3.20/8.1/Dockerfile index 454e80b5..6d2747f8 100644 --- a/alpine/3.20/8.1/Dockerfile +++ b/alpine/3.20/8.1/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -69,7 +70,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/alpine/3.20/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile index 0acc692c..9905ae67 100644 --- a/alpine/3.20/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -28,8 +28,8 @@ ARG PHP_RUN_DEPS="\ libxml2 \ libxpm \ libxslt \ - libzip" - + libzip \ + rabbitmq-c" ARG PHP_BUILD_DEPS="\ autoconf \ @@ -44,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxml2-dev \ libxpm-dev \ libzip-dev \ - postgresql-dev" + postgresql-dev \ + rabbitmq-c-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -70,7 +71,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG GRAPHVIZ_BUILD_DEPS="\ expat-dev" diff --git a/context/php/disabled/amqp.ini b/context/php/disabled/amqp.ini new file mode 100644 index 00000000..319294d8 --- /dev/null +++ b/context/php/disabled/amqp.ini @@ -0,0 +1 @@ +extension = amqp.so diff --git a/debian/bullseye/8.0/Dockerfile b/debian/bullseye/8.0/Dockerfile index 9bfbfd07..f43e57a3 100644 --- a/debian/bullseye/8.0/Dockerfile +++ b/debian/bullseye/8.0/Dockerfile @@ -29,7 +29,6 @@ ARG PHP_RUN_DEPS="\ libxslt1.1 \ libzip4" - ARG PHP_BUILD_DEPS="\ libbz2-dev \ libfreetype6-dev \ @@ -41,7 +40,8 @@ ARG PHP_BUILD_DEPS="\ libwebp-dev \ libxml2-dev \ libxpm-dev \ - libzip-dev" + libzip-dev \ + librabbitmq-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -66,7 +66,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bullseye/8.1/Dockerfile b/debian/bullseye/8.1/Dockerfile index 277d099e..8d0c2fa6 100644 --- a/debian/bullseye/8.1/Dockerfile +++ b/debian/bullseye/8.1/Dockerfile @@ -29,7 +29,6 @@ ARG PHP_RUN_DEPS="\ libxslt1.1 \ libzip4" - ARG PHP_BUILD_DEPS="\ libbz2-dev \ libfreetype6-dev \ @@ -41,7 +40,8 @@ ARG PHP_BUILD_DEPS="\ libwebp-dev \ libxml2-dev \ libxpm-dev \ - libzip-dev" + libzip-dev \ + librabbitmq-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -66,7 +66,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ diff --git a/debian/bullseye/8.2/Dockerfile b/debian/bullseye/8.2/Dockerfile index 0f5ffe9d..d6177fb6 100644 --- a/debian/bullseye/8.2/Dockerfile +++ b/debian/bullseye/8.2/Dockerfile @@ -29,7 +29,6 @@ ARG PHP_RUN_DEPS="\ libxslt1.1 \ libzip4" - ARG PHP_BUILD_DEPS="\ libbz2-dev \ libfreetype6-dev \ @@ -41,7 +40,8 @@ ARG PHP_BUILD_DEPS="\ libwebp-dev \ libxml2-dev \ libxpm-dev \ - libzip-dev" + libzip-dev \ + librabbitmq-dev" ARG PHP_EXTENSIONS="\ bcmath \ @@ -67,7 +67,8 @@ ARG PHP_PECL_EXTENSIONS="\ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\ pcov \ xdebug \ - xhprof" + xhprof \ + amqp" ARG CFLAGS="-I/usr/src/php" RUN apt update -y \ @@ -125,8 +126,8 @@ RUN DEBIAN_FRONTEND=noninteractive dpkg-reconfigure dash # Blackfire ENV BLACKFIRE_AGENT_SOCKET='' RUN architecture=$(case ${TARGETPLATFORM} in "linux/amd64") echo "amd64" ;; linux/arm64) echo "arm64" ;; *) echo "amd64" ;; esac) \ - && curl -A "Docker" -o /tmp/blackfire.so -D - -L -s https://packages.blackfire.io/binaries/blackfire-php/${BLACKFIRE_VERSION}/blackfire-php-linux_${architecture}-php-${BLACKFIRE_PHP_VERSION}.so \ - && mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so + && curl -A "Docker" -o /tmp/blackfire.so -D - -L -s https://packages.blackfire.io/binaries/blackfire-php/${BLACKFIRE_VERSION}/blackfire-php-linux_${architecture}-php-${BLACKFIRE_PHP_VERSION}.so \ + && mv /tmp/blackfire.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so # New Relic ENV NEWRELIC_ENABLED=0 @@ -139,24 +140,24 @@ ENV NEWRELIC_TRANSACTION_TRACER_THRESHOLD=0 ENV NEWRELIC_DISTRIBUTED_TRACING_EXCLUDE_NEWRELIC_HEADER=0 RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC_VERSION}/newrelic-php5-${NEWRELIC_VERSION}-linux.tar.gz" | tar -C /tmp -zx \ - && export NR_INSTALL_USE_CP_NOT_LN=1 \ - && export NR_INSTALL_SILENT=1 \ - && /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' + && export NR_INSTALL_USE_CP_NOT_LN=1 \ + && export NR_INSTALL_SILENT=1 \ + && /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' # Tideways RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/amd64" ]; then \ - wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz" && \ - tar xvzf tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz && \ - cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' + wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz" && \ + tar xvzf tideways-php-${TIDEWAYS_VERSION}-x86_64.tar.gz && \ + cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \ - wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz" && \ - tar xvzf tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz && \ - cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' + wget "https://s3-eu-west-1.amazonaws.com/tideways/extension/${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz" && \ + tar xvzf tideways-php-${TIDEWAYS_VERSION}-arm64.tar.gz && \ + cp ./tideways-${TIDEWAYS_VERSION}/tideways-php-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi' # Opcache RUN /usr/bin/install -d -m 777 /var/run/opcache From 7be74780f121a26683794d660d068299e5979001 Mon Sep 17 00:00:00 2001 From: Olha Livitchuk <77281282+olhalivitchuk@users.noreply.github.com> Date: Mon, 16 Sep 2024 21:52:01 +0200 Subject: [PATCH 6/8] FRW-8801 Added PHP 8.3 support. (#99) * FRW-8801 Added PHP 83 support * FRW-8801 Adjusted TIDEWAYS_VERSION * FRW-8801 Adjusted php ver for alpine 18 * FRW-8801 Adjustments after review * FRW-8801 Removed DS_Store from git cache * FRW-8801 Removed DS_Store from git cache * FRW-8801 Reverted changes for latest image --- .DS_Store | Bin 6148 -> 0 bytes .github/workflows/ci.yml | 15 +++ .github/workflows/security.yml | 20 ++++ .gitignore | 1 + README.md | 26 +++-- alpine/3.17/8.3/Dockerfile | 188 ++++++++++++++++++++++++++++++ alpine/3.18/8.3/Dockerfile | 203 +++++++++++++++++++++++++++++++++ alpine/3.19/8.3/Dockerfile | 202 ++++++++++++++++++++++++++++++++ alpine/3.20/8.3/Dockerfile | 202 ++++++++++++++++++++++++++++++++ debian/bullseye/8.3/Dockerfile | 197 ++++++++++++++++++++++++++++++++ 10 files changed, 1044 insertions(+), 10 deletions(-) delete mode 100644 .DS_Store create mode 100644 alpine/3.17/8.3/Dockerfile create mode 100644 alpine/3.18/8.3/Dockerfile create mode 100644 alpine/3.19/8.3/Dockerfile create mode 100644 alpine/3.20/8.3/Dockerfile create mode 100644 debian/bullseye/8.3/Dockerfile diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 0b0222d37a9678bc3b422ca95f9ed9d1044e8923..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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! Date: Mon, 7 Oct 2024 20:15:03 +0300 Subject: [PATCH 7/8] Update .github/PULL_REQUEST_TEMPLATE.md --- .github/PULL_REQUEST_TEMPLATE.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE.md diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..238299e4 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,13 @@ +## PR Description +Add a meaningful description here that will let us know what you want to fix with this PR or what functionality you want to add. + +## Steps before you submit a PR +- Please add tests for the code you add if it's possible. +- Please check out our contribution guide: https://docs.spryker.com/docs/dg/dev/code-contribution-guide.html +- Add a `contribution-license-agreement.txt` file with the following content: +`I hereby agree to Spryker\'s Contribution License Agreement in https://github.com/spryker/docker-php/blob/HASH_OF_COMMIT_YOU_ARE_BASING_YOUR_BRANCH_FROM_MASTER_BRANCH/CONTRIBUTING.md.` + +This is a mandatory step to make sure you are aware of the license agreement and agree to it. `HASH_OF_COMMIT_YOU_ARE_BASING_YOUR_BRANCH_FROM_MASTER_BRANCH` is a hash of the commit you are basing your branch from the master branch. You can take it from commits list of master branch before you submit a PR. + +## Checklist +- [x] I agree with the Code Contribution License Agreement in CONTRIBUTING.md From 54de45e0cceea45773cfc79be509b6a826d67e29 Mon Sep 17 00:00:00 2001 From: Aleksandr Myrnyi Date: Tue, 15 Oct 2024 14:26:05 +0200 Subject: [PATCH 8/8] [SC-21544] Session lock (#100) * [SC-21544] Session lock * [PHP 8.3] Revert the debug mode * Revert gnu-libiconv package * Update composer version + update php version * Extend the CI with image tagging --- .github/workflows/ci.yml | 37 +++++++++++++++---- README.md | 47 ++++++++++++------------ alpine/3.17/8.1/Dockerfile | 2 +- alpine/3.17/8.2/Dockerfile | 2 +- alpine/3.17/8.3/Dockerfile | 2 +- alpine/3.18/8.1/Dockerfile | 2 +- alpine/3.18/8.2/Dockerfile | 2 +- alpine/3.18/8.3/Dockerfile | 4 +-- alpine/3.19/8.1/Dockerfile | 4 +-- alpine/3.19/8.2/Dockerfile | 4 +-- alpine/3.19/8.3/Dockerfile | 4 +-- alpine/3.20/8.1/Dockerfile | 31 ++++++++-------- alpine/3.20/8.2/Dockerfile | 66 +++++++++++++++++----------------- alpine/3.20/8.3/Dockerfile | 22 ++++++------ debian/bullseye/8.0/Dockerfile | 2 +- debian/bullseye/8.1/Dockerfile | 4 +-- debian/bullseye/8.2/Dockerfile | 4 +-- debian/bullseye/8.3/Dockerfile | 4 +-- 18 files changed, 136 insertions(+), 107 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba5aff68..2240e367 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,13 +23,13 @@ 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" ] - image: "alpine/3.18/8.3/Dockerfile" - tags: [ "spryker/php:8.3", "spryker/php:8.3-alpine3.18" ] + tags: [ "spryker/php:8.3-alpine3.18" ] platforms: [ "linux/amd64", "linux/arm64" ] ### Alpine 3.19 @@ -45,13 +45,13 @@ jobs: ### Alpine 3.20 - image: "alpine/3.20/8.1/Dockerfile" - tags: [ "spryker/php:8.1-alpine3.20" ] + tags: [ "spryker/php:8.1", "spryker/php:8.1-alpine3.20" ] platforms: [ "linux/amd64", "linux/arm64" ] - image: "alpine/3.20/8.2/Dockerfile" - tags: [ "spryker/php:8.2-alpine3.20" ] + tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.20" ] platforms: [ "linux/amd64", "linux/arm64" ] - image: "alpine/3.20/8.3/Dockerfile" - tags: [ "spryker/php:8.3-alpine3.20" ] + tags: [ "spryker/php:8.3", "spryker/php:8.3-alpine3.20" ] platforms: [ "linux/amd64", "linux/arm64" ] ## Debian @@ -69,6 +69,18 @@ jobs: tags: [ "spryker/php:8.3-debian" ] platforms: [ "linux/amd64", "linux/arm64" ] steps: + - name: Check out repository + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Get the previous commit hash + id: previous_commit + if: ${{ github.ref == 'refs/heads/master' }} + run: | + PREV_COMMIT_HASH=$(git rev-parse HEAD^1) + echo "PREV_COMMIT_HASH=$PREV_COMMIT_HASH" >> $GITHUB_ENV + - name: Set up QEMU uses: docker/setup-qemu-action@v2 @@ -81,6 +93,19 @@ jobs: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} + - name: Re-tag images with previous commit hash + if: ${{ github.ref == 'refs/heads/master' }} + run: | + PREV_HASH=${{ env.PREV_COMMIT_HASH }} + IMAGE_TAGS="${{ join(matrix.tags, ' ') }}" + for IMAGE_TAG in $IMAGE_TAGS; do + docker pull "$IMAGE_TAG" + NEW_TAG="${IMAGE_TAG}-${PREV_HASH}" + docker tag "$IMAGE_TAG" "$NEW_TAG" + echo "Re-tagged image: $NEW_TAG" + docker push $NEW_TAG + done + - name: Build and push id: docker_build uses: docker/build-push-action@v2 diff --git a/README.md b/README.md index 3c24656a..d746fc9e 100644 --- a/README.md +++ b/README.md @@ -30,25 +30,25 @@ 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.20 | 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.19/8.3/Dockerfile) | -| [spryker/php:8.3](https://hub.docker.com/r/spryker/php/tags?name=8.3) | 8.3.11 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3.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.3/Dockerfile) | -| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.20 | 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.19/8.2/Dockerfile) | -| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.29 | 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.19/8.1/Dockerfile) | -| [spryker/php:8.3-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.20) | 8.3.11 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.3/Dockerfile) | -| [spryker/php:8.2-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.20) | 8.2.22 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.2/Dockerfile) | -| [spryker/php:8.1-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.1/Dockerfile) | -| [spryker/php:8.3-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.19) | 8.3.11 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.3/Dockerfile) | -| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.22 | 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.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | 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.3-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.18) | 8.3.6 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.3/Dockerfile) | +| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.20 | Alpine 3.20 | [![](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.20/8.2/Dockerfile) | +| [spryker/php:8.3](https://hub.docker.com/r/spryker/php/tags?name=8.3) | 8.3.12 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3.svg)](https://microbadger.com/images/spryker/php:8.3 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.3/Dockerfile) | +| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.24 | Alpine 3.20 | [![](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.20/8.2/Dockerfile) | +| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.30 | Alpine 3.20 | [![](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.20/8.1/Dockerfile) | +| [spryker/php:8.3-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.20) | 8.3.12 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.3/Dockerfile) | +| [spryker/php:8.2-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.20) | 8.2.24 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.2/Dockerfile) | +| [spryker/php:8.1-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.30 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.1/Dockerfile) | +| [spryker/php:8.3-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.19) | 8.3.12 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.3/Dockerfile) | +| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.24 | 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.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.30 | 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.3-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.18) | 8.3.7 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.3/Dockerfile) | | [spryker/php:8.2-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.18) | 8.2.19 | 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.28 | 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.3-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.3-alpine3.17) | 8.3.0 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.3-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.17/8.3/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.3-debian](https://hub.docker.com/r/spryker/php/tags?name=8.3-debian) | 8.3.11 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-debian.svg)](https://microbadger.com/images/spryker/php:8.3-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.3/Dockerfile) | -| [spryker/php:8.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.22 | 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.29 | 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.3-debian](https://hub.docker.com/r/spryker/php/tags?name=8.3-debian) | 8.3.12 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.3-debian.svg)](https://microbadger.com/images/spryker/php:8.3-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.3/Dockerfile) | +| [spryker/php:8.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.24 | 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.30 | 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.30 | 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) | ## How to use @@ -177,24 +177,27 @@ Installed extensions Disabled extensions ==================== - [ ] blackfire 1.87.1 - [ ] newrelic 10.11.0.3 + [ ] amqp 2.1.2 + [ ] blackfire 1.87.1~linux-musl-x64-non_zts82 + [ ] newrelic 10.22.0.12 [ ] pcov 1.0.11 [ ] tideways 5.5.14 - [ ] xhprof 2.3.9 + [ ] xhprof 2.3.10 INSTALLED PACKAGES, CHANNEL PECL.PHP.NET: ========================================= PACKAGE VERSION STATE -apcu 5.1.22 stable +amqp 2.1.2 stable +apcu 5.1.24 stable pcov 1.0.11 stable -redis 5.3.7 stable -xdebug 3.2.2 stable -xhprof 2.3.9 stable +redis 6.1.0 stable +xdebug 3.3.2 stable +xhprof 2.3.10 stable Composer ==================== -Composer version 2.5.8 2023-06-09 17:13:21 +PHP version 8.2.24 (/usr/local/bin/php) +Composer version 2.8.1 2024-10-04 11:31:01 ``` ##### Run the following to get the report ```bash diff --git a/alpine/3.17/8.1/Dockerfile b/alpine/3.17/8.1/Dockerfile index f2b3e83a..3806040c 100644 --- a/alpine/3.17/8.1/Dockerfile +++ b/alpine/3.17/8.1/Dockerfile @@ -4,7 +4,7 @@ ARG SPRYKER_PHP_VERSION=8.1.26 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.17/8.2/Dockerfile b/alpine/3.17/8.2/Dockerfile index 3643b451..28f648da 100644 --- a/alpine/3.17/8.2/Dockerfile +++ b/alpine/3.17/8.2/Dockerfile @@ -4,7 +4,7 @@ ARG SPRYKER_PHP_VERSION=8.2.13 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.17/8.3/Dockerfile b/alpine/3.17/8.3/Dockerfile index 2fbe41a6..39d49e88 100644 --- a/alpine/3.17/8.3/Dockerfile +++ b/alpine/3.17/8.3/Dockerfile @@ -4,7 +4,7 @@ ARG SPRYKER_PHP_VERSION=8.3 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.17 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.18/8.1/Dockerfile b/alpine/3.18/8.1/Dockerfile index 034b7f70..89052c75 100644 --- a/alpine/3.18/8.1/Dockerfile +++ b/alpine/3.18/8.1/Dockerfile @@ -4,7 +4,7 @@ ARG SPRYKER_PHP_VERSION=8.1.28 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.18/8.2/Dockerfile b/alpine/3.18/8.2/Dockerfile index 91e07bc0..e3e6e261 100644 --- a/alpine/3.18/8.2/Dockerfile +++ b/alpine/3.18/8.2/Dockerfile @@ -4,7 +4,7 @@ ARG SPRYKER_PHP_VERSION=8.2.19 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.18/8.3/Dockerfile b/alpine/3.18/8.3/Dockerfile index 363b5226..649acded 100644 --- a/alpine/3.18/8.3/Dockerfile +++ b/alpine/3.18/8.3/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.3.6 +ARG SPRYKER_PHP_VERSION=8.3.7 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.19/8.1/Dockerfile b/alpine/3.19/8.1/Dockerfile index 3d613ff4..141fc9cb 100644 --- a/alpine/3.19/8.1/Dockerfile +++ b/alpine/3.19/8.1/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.29 +ARG SPRYKER_PHP_VERSION=8.1.30 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.19/8.2/Dockerfile b/alpine/3.19/8.2/Dockerfile index 7e932414..076bb312 100644 --- a/alpine/3.19/8.2/Dockerfile +++ b/alpine/3.19/8.2/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.22 +ARG SPRYKER_PHP_VERSION=8.2.24 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.19/8.3/Dockerfile b/alpine/3.19/8.3/Dockerfile index d4be4287..29f490f2 100644 --- a/alpine/3.19/8.3/Dockerfile +++ b/alpine/3.19/8.3/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.3.11 +ARG SPRYKER_PHP_VERSION=8.3.12 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/alpine/3.20/8.1/Dockerfile b/alpine/3.20/8.1/Dockerfile index 6d2747f8..323c7fc2 100644 --- a/alpine/3.20/8.1/Dockerfile +++ b/alpine/3.20/8.1/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.29 +ARG SPRYKER_PHP_VERSION=8.1.30 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 ARG NEWRELIC_VERSION=10.22.0.12 @@ -12,7 +12,6 @@ ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.1 ENV srcRoot /data - RUN mkdir -p ${srcRoot} ARG PHP_RUN_DEPS="\ @@ -45,7 +44,8 @@ ARG PHP_BUILD_DEPS="\ libxpm-dev \ libzip-dev \ postgresql-dev \ - rabbitmq-c-dev" + rabbitmq-c-dev \ + g++" ARG PHP_EXTENSIONS="\ bcmath \ @@ -95,19 +95,20 @@ RUN apk update \ shadow \ unzip \ linux-headers \ + libstdc++ \ ${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} \ + && 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 \ - --disable-gd-jis-conv \ - --with-freetype=/usr \ - --with-jpeg=/usr \ - --with-webp=/usr \ - --with-xpm=/usr \ + && cd /tmp && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \ + && tar xzf icu4c-74_1-src.tgz \ + && cd icu/source && ./configure --prefix=/usr && make && make install \ + && docker-php-ext-configure gd \ + --disable-gd-jis-conv \ + --with-freetype=/usr \ + --with-jpeg=/usr \ + --with-webp=/usr \ + --with-xpm=/usr \ && docker-php-ext-install -j5 ${PHP_EXTENSIONS} \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ diff --git a/alpine/3.20/8.2/Dockerfile b/alpine/3.20/8.2/Dockerfile index 9905ae67..b3a3db03 100644 --- a/alpine/3.20/8.2/Dockerfile +++ b/alpine/3.20/8.2/Dockerfile @@ -1,10 +1,9 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.22 - +ARG SPRYKER_PHP_VERSION=8.2.24 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=10.22.0.12 @@ -12,7 +11,6 @@ ARG TIDEWAYS_VERSION=5.5.14 ARG TIDEWAYS_PHP_VERSION=8.2 ENV srcRoot /data - RUN mkdir -p ${srcRoot} ARG PHP_RUN_DEPS="\ @@ -45,7 +43,8 @@ ARG PHP_BUILD_DEPS="\ libxpm-dev \ libzip-dev \ postgresql-dev \ - rabbitmq-c-dev" + rabbitmq-c-dev \ + g++" ARG PHP_EXTENSIONS="\ bcmath \ @@ -81,34 +80,35 @@ ARG CFLAGS="-I/usr/src/php" RUN apk update \ && apk upgrade \ && apk add --no-cache \ - bash \ - coreutils \ - curl \ - g++ \ - git \ - make \ - mysql-client \ - netcat-openbsd \ - openssh \ - postgresql-client \ - procps \ - python3 \ - shadow \ - 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} \ + bash \ + coreutils \ + curl \ + g++ \ + git \ + make \ + mysql-client \ + netcat-openbsd \ + openssh \ + postgresql-client \ + procps \ + python3 \ + shadow \ + unzip \ + linux-headers \ + libstdc++ \ + ${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 \ - --disable-gd-jis-conv \ - --with-freetype=/usr \ - --with-jpeg=/usr \ - --with-webp=/usr \ - --with-xpm=/usr \ + && cd /tmp && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \ + && tar xzf icu4c-74_1-src.tgz \ + && cd icu/source && ./configure --prefix=/usr && make && make install \ + && docker-php-ext-configure gd \ + --disable-gd-jis-conv \ + --with-freetype=/usr \ + --with-jpeg=/usr \ + --with-webp=/usr \ + --with-xpm=/usr \ && docker-php-ext-install -j5 ${PHP_EXTENSIONS} \ && pecl install -o -f ${PHP_PECL_EXTENSIONS} ${ADDITIONAL_PHP_PECL_EXTENSIONS} \ && rm -rf /tmp/pear \ @@ -156,7 +156,7 @@ 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 +#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 && \ diff --git a/alpine/3.20/8.3/Dockerfile b/alpine/3.20/8.3/Dockerfile index 5e27afef..6adeda72 100644 --- a/alpine/3.20/8.3/Dockerfile +++ b/alpine/3.20/8.3/Dockerfile @@ -1,10 +1,9 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.3.11 - +ARG SPRYKER_PHP_VERSION=8.3.12 FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20 ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=10.22.0.12 @@ -12,7 +11,6 @@ ARG TIDEWAYS_VERSION=5.6.4 ARG TIDEWAYS_PHP_VERSION=8.3 ENV srcRoot /data - RUN mkdir -p ${srcRoot} ARG PHP_RUN_DEPS="\ @@ -45,7 +43,8 @@ ARG PHP_BUILD_DEPS="\ libxpm-dev \ libzip-dev \ postgresql-dev \ - rabbitmq-c-dev" + rabbitmq-c-dev \ + g++" ARG PHP_EXTENSIONS="\ bcmath \ @@ -96,14 +95,15 @@ RUN apk update \ shadow \ unzip \ linux-headers \ + libstdc++ \ ${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} \ + && 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 \ + && cd /tmp && curl -LO https://github.com/unicode-org/icu/releases/download/release-74-1/icu4c-74_1-src.tgz \ + && tar xzf icu4c-74_1-src.tgz \ + && cd icu/source && ./configure --prefix=/usr && make && make install \ + && docker-php-ext-configure gd \ --disable-gd-jis-conv \ --with-freetype=/usr \ --with-jpeg=/usr \ diff --git a/debian/bullseye/8.0/Dockerfile b/debian/bullseye/8.0/Dockerfile index f43e57a3..cde06f5f 100644 --- a/debian/bullseye/8.0/Dockerfile +++ b/debian/bullseye/8.0/Dockerfile @@ -4,7 +4,7 @@ ARG SPRYKER_PHP_VERSION=8.0.30 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=80 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/debian/bullseye/8.1/Dockerfile b/debian/bullseye/8.1/Dockerfile index 8d0c2fa6..9b0dfd2b 100644 --- a/debian/bullseye/8.1/Dockerfile +++ b/debian/bullseye/8.1/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.1.29 +ARG SPRYKER_PHP_VERSION=8.1.30 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=81 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/debian/bullseye/8.2/Dockerfile b/debian/bullseye/8.2/Dockerfile index d6177fb6..05b060fc 100644 --- a/debian/bullseye/8.2/Dockerfile +++ b/debian/bullseye/8.2/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.2.22 +ARG SPRYKER_PHP_VERSION=8.2.24 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=82 ARG NEWRELIC_VERSION=10.22.0.12 diff --git a/debian/bullseye/8.3/Dockerfile b/debian/bullseye/8.3/Dockerfile index aead10d4..f546eae8 100644 --- a/debian/bullseye/8.3/Dockerfile +++ b/debian/bullseye/8.3/Dockerfile @@ -1,10 +1,10 @@ # syntax = docker/dockerfile:1.0.2-experimental -ARG SPRYKER_PHP_VERSION=8.3.11 +ARG SPRYKER_PHP_VERSION=8.3.12 FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye ARG TARGETPLATFORM -ARG COMPOSER_VERSION=2.6.6 +ARG COMPOSER_VERSION=2.8.1 ARG BLACKFIRE_VERSION=1.87.1 ARG BLACKFIRE_PHP_VERSION=83 ARG NEWRELIC_VERSION=10.22.0.12