From 7159fac0b0ff9eef0cd98124a8c8cf94a2cd6e0a Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Wed, 12 Jun 2024 12:50:44 +0200 Subject: [PATCH 1/4] [INFRA] new php releases --- .github/workflows/php-8.2.yml | 2 +- .github/workflows/php-8.3.yml | 2 +- README.md | 2 +- src/8.2/src/Dockerfile | 2 +- src/8.3/src/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/php-8.2.yml b/.github/workflows/php-8.2.yml index b25f82e..199e1de 100644 --- a/.github/workflows/php-8.2.yml +++ b/.github/workflows/php-8.2.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: version: ['8.2'] - patchVersion: [14,15,16,17,18] + patchVersion: [15,16,17,18,19] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/php-8.3.yml b/.github/workflows/php-8.3.yml index 79fc2d9..9004723 100644 --- a/.github/workflows/php-8.3.yml +++ b/.github/workflows/php-8.3.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: version: ['8.3'] - patchVersion: [2,3,4,5,6] + patchVersion: [3,4,5,6,7] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/README.md b/README.md index f5409c2..33364fd 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ https://github.com/Imagick/imagick/tags https://github.com/newrelic/newrelic-php-agent/releases # Sample building for testing: -docker build -f src/7.4/src/Dockerfile -t docker.io/openmage/php:7.4.29 src/7.4/src/ +docker build -f src/7.4/src/Dockerfile -t docker.io/openmage/php:8.3.6 src/8.3/src/ # Sample building for multi arch testing and push to docker hub: cd src/8.3/src && docker buildx create --use && docker buildx build --progress=plain --platform linux/amd64,linux/arm64 --push -t docker.io/openmage/php:8.3.0 . diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile index 3136f70..b2113fc 100644 --- a/src/8.2/src/Dockerfile +++ b/src/8.2/src/Dockerfile @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary" ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl" ARG PHP_CONFIGURE_ARGS_EXTRA="" ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data" -ARG PHP_VERSION="8.2.18" +ARG PHP_VERSION="8.2.19" ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ diff --git a/src/8.3/src/Dockerfile b/src/8.3/src/Dockerfile index 397f984..b330ae4 100644 --- a/src/8.3/src/Dockerfile +++ b/src/8.3/src/Dockerfile @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary" ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl" ARG PHP_CONFIGURE_ARGS_EXTRA="" ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data" -ARG PHP_VERSION="8.3.6" +ARG PHP_VERSION="8.3.7" ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ From f07ac1281582fc471384af9f8809335efd083865 Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Thu, 22 Aug 2024 10:15:25 +0200 Subject: [PATCH 2/4] [INFRA] bump libs and releases --- .github/workflows/php-8.1.yml | 2 +- .github/workflows/php-8.2.yml | 2 +- .github/workflows/php-8.3.yml | 2 +- src/8.1/src/Dockerfile | 2 +- src/8.2/src/Dockerfile | 2 +- src/8.3/src/Dockerfile | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/php-8.1.yml b/.github/workflows/php-8.1.yml index 1be5820..3a0e1e5 100644 --- a/.github/workflows/php-8.1.yml +++ b/.github/workflows/php-8.1.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: version: ['8.1'] - patchVersion: [23,24,25,26,27] + patchVersion: [24,25,26,27,28] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/php-8.2.yml b/.github/workflows/php-8.2.yml index 199e1de..1d8fafd 100644 --- a/.github/workflows/php-8.2.yml +++ b/.github/workflows/php-8.2.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: version: ['8.2'] - patchVersion: [15,16,17,18,19] + patchVersion: [17,18,19,20,21] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/php-8.3.yml b/.github/workflows/php-8.3.yml index 9004723..b6e7118 100644 --- a/.github/workflows/php-8.3.yml +++ b/.github/workflows/php-8.3.yml @@ -16,7 +16,7 @@ jobs: strategy: matrix: version: ['8.3'] - patchVersion: [3,4,5,6,7] + patchVersion: [5,6,7,8,9] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile index ca16606..14b54a7 100644 --- a/src/8.1/src/Dockerfile +++ b/src/8.1/src/Dockerfile @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary" ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl" ARG PHP_CONFIGURE_ARGS_EXTRA="" ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data" -ARG PHP_VERSION="8.1.25" +ARG PHP_VERSION="8.1.28" ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile index b2113fc..05a0b00 100644 --- a/src/8.2/src/Dockerfile +++ b/src/8.2/src/Dockerfile @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary" ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl" ARG PHP_CONFIGURE_ARGS_EXTRA="" ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data" -ARG PHP_VERSION="8.2.19" +ARG PHP_VERSION="8.2.21" ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ diff --git a/src/8.3/src/Dockerfile b/src/8.3/src/Dockerfile index b330ae4..ee33017 100644 --- a/src/8.3/src/Dockerfile +++ b/src/8.3/src/Dockerfile @@ -10,7 +10,7 @@ ARG PHP_PECL_REQUIREMENTS="redis igbinary" ARG PHP_CONFIGURE_ARGS="--enable-soap --enable-intl" ARG PHP_CONFIGURE_ARGS_EXTRA="" ARG PHP_CONFIGURE_ARGS_FPM="--enable-fpm --with-fpm-user=www-data --with-fpm-group=www-data" -ARG PHP_VERSION="8.3.7" +ARG PHP_VERSION="8.3.9" ENV PHP_CFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ PHP_CPPFLAGS="-fstack-protector-strong -fpic -fpie -O2" \ From f4682c7510784abb42e0575d2e427c5b2896b5fa Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Thu, 22 Aug 2024 11:02:28 +0200 Subject: [PATCH 3/4] [INFRA] update gitlab actions --- .github/workflows/php-7.4.yml | 12 ++++++------ .github/workflows/php-8.0.yml | 14 +++++++------- .github/workflows/php-8.1.yml | 14 +++++++------- .github/workflows/php-8.2.yml | 14 +++++++------- .github/workflows/php-8.3.yml | 14 +++++++------- .github/workflows/pull_request.yml | 4 ++-- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.github/workflows/php-7.4.yml b/.github/workflows/php-7.4.yml index b898962..e58b0d6 100644 --- a/.github/workflows/php-7.4.yml +++ b/.github/workflows/php-7.4.yml @@ -19,20 +19,20 @@ jobs: patchVersion: [33] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build php image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 @@ -43,7 +43,7 @@ jobs: build-args: | PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} - name: Build toolbox image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/php-8.0.yml b/.github/workflows/php-8.0.yml index 684d8ce..2aeaf54 100644 --- a/.github/workflows/php-8.0.yml +++ b/.github/workflows/php-8.0.yml @@ -19,20 +19,20 @@ jobs: patchVersion: [30] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build php image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 @@ -41,9 +41,9 @@ jobs: file: ./src/${{ matrix.version }}/src/Dockerfile target: php build-args: | - PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} + PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} - name: Build toolbox image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/php-8.1.yml b/.github/workflows/php-8.1.yml index 3a0e1e5..c864bb4 100644 --- a/.github/workflows/php-8.1.yml +++ b/.github/workflows/php-8.1.yml @@ -19,20 +19,20 @@ jobs: patchVersion: [24,25,26,27,28] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build php image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 @@ -41,9 +41,9 @@ jobs: file: ./src/${{ matrix.version }}/src/Dockerfile target: php build-args: | - PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} + PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} - name: Build toolbox image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/php-8.2.yml b/.github/workflows/php-8.2.yml index 1d8fafd..d612b32 100644 --- a/.github/workflows/php-8.2.yml +++ b/.github/workflows/php-8.2.yml @@ -19,20 +19,20 @@ jobs: patchVersion: [17,18,19,20,21] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build php image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 @@ -41,9 +41,9 @@ jobs: file: ./src/${{ matrix.version }}/src/Dockerfile target: php build-args: | - PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} + PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} - name: Build toolbox image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/php-8.3.yml b/.github/workflows/php-8.3.yml index b6e7118..4ea5fc6 100644 --- a/.github/workflows/php-8.3.yml +++ b/.github/workflows/php-8.3.yml @@ -19,20 +19,20 @@ jobs: patchVersion: [5,6,7,8,9] steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v1 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v3 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - name: Build php image id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 @@ -41,9 +41,9 @@ jobs: file: ./src/${{ matrix.version }}/src/Dockerfile target: php build-args: | - PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} + PHP_VERSION=${{ matrix.version }}.${{ matrix.patchVersion }} - name: Build toolbox image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v6 with: push: true platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index a43a19d..11eb329 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest container: pipelinecomponents/hadolint:latest steps: - - uses: actions/checkout@v2 - - uses: hadolint/hadolint-action@v1.5.0 + - uses: actions/checkout@v4 + - uses: hadolint/hadolint-action@v3.1.0 with: dockerfile: ./src/${{ matrix.version }}/src/Dockerfile From 6f86a509e09117e2499200988ab4099f4614ad8f Mon Sep 17 00:00:00 2001 From: Andreas Mautz Date: Thu, 22 Aug 2024 11:53:18 +0200 Subject: [PATCH 4/4] [INFRA] update gitlab actions, fix new linting errors --- src/7.4/src/Dockerfile | 2 +- src/8.0/src/Dockerfile | 2 +- src/8.1/src/Dockerfile | 2 +- src/8.2/src/Dockerfile | 2 +- src/8.3/src/Dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/7.4/src/Dockerfile b/src/7.4/src/Dockerfile index 9cfaae3..52b04c2 100644 --- a/src/7.4/src/Dockerfile +++ b/src/7.4/src/Dockerfile @@ -43,7 +43,7 @@ RUN set -xe; \ docker-php-source extract; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - if [[ ! -d "/usr/include/curl" ]]; then \ + if [ ! -d "/usr/include/curl" ]; then \ ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \ fi; \ cd /usr/src/php; \ diff --git a/src/8.0/src/Dockerfile b/src/8.0/src/Dockerfile index 91407ef..de0c3b2 100644 --- a/src/8.0/src/Dockerfile +++ b/src/8.0/src/Dockerfile @@ -43,7 +43,7 @@ RUN set -xe; \ docker-php-source extract; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - if [[ ! -d "/usr/include/curl" ]]; then \ + if [ ! -d "/usr/include/curl" ]; then \ ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \ fi; \ cd /usr/src/php; \ diff --git a/src/8.1/src/Dockerfile b/src/8.1/src/Dockerfile index 14b54a7..72345f4 100644 --- a/src/8.1/src/Dockerfile +++ b/src/8.1/src/Dockerfile @@ -43,7 +43,7 @@ RUN set -xe; \ docker-php-source extract; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - if [[ ! -d "/usr/include/curl" ]]; then \ + if [ ! -d "/usr/include/curl" ]; then \ ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \ fi; \ cd /usr/src/php; \ diff --git a/src/8.2/src/Dockerfile b/src/8.2/src/Dockerfile index 05a0b00..8603a32 100644 --- a/src/8.2/src/Dockerfile +++ b/src/8.2/src/Dockerfile @@ -43,7 +43,7 @@ RUN set -xe; \ docker-php-source extract; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - if [[ ! -d "/usr/include/curl" ]]; then \ + if [ ! -d "/usr/include/curl" ]; then \ ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \ fi; \ cd /usr/src/php; \ diff --git a/src/8.3/src/Dockerfile b/src/8.3/src/Dockerfile index ee33017..c3a1150 100644 --- a/src/8.3/src/Dockerfile +++ b/src/8.3/src/Dockerfile @@ -43,7 +43,7 @@ RUN set -xe; \ docker-php-source extract; \ gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ - if [[ ! -d "/usr/include/curl" ]]; then \ + if [ ! -d "/usr/include/curl" ]; then \ ln -sT "/usr/include/${debMultiarch}/curl" /usr/local/include/curl; \ fi; \ cd /usr/src/php; \