From 09fb0248373c6fa0fceee42a1f6fe0c3e9f10d12 Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Mon, 28 Jul 2025 12:28:57 -0400 Subject: [PATCH 1/2] Comments out centos job from the main build and test build actions --- .github/workflows/build.yaml | 68 +++++++++++++++---------------- .github/workflows/test-build.yaml | 56 ++++++++++++------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fda5967..059f6fc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -88,37 +88,37 @@ jobs: tags: ${{ steps.meta-others.outputs.tags }} labels: ${{ steps.meta-others.outputs.labels }} - - Build_PHP_CentOS8: - strategy: - matrix: - version: ['7.2', '7.3', '7.4', '8.0', '8.1'] - environment: - name: Build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Login to DockerHub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push CentOS based Docker images - uses: docker/build-push-action@v6 - with: - push: true - context: centos8 - platforms: linux/amd64 - build-args: PHP_VERSION=${{ matrix.version }} - tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }} +# CentOS images have been deprecated +# Build_PHP_CentOS8: +# strategy: +# matrix: +# version: ['7.2', '7.3', '7.4', '8.0', '8.1'] +# environment: +# name: Build +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# with: +# ref: ${{ github.ref }} +# +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v3 +# +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v3 +# +# - name: Login to DockerHub +# uses: docker/login-action@v3 +# with: +# username: ${{ secrets.DOCKERHUB_USERNAME }} +# password: ${{ secrets.DOCKERHUB_TOKEN }} +# +# - name: Build and push CentOS based Docker images +# uses: docker/build-push-action@v6 +# with: +# push: true +# context: centos8 +# platforms: linux/amd64 +# build-args: PHP_VERSION=${{ matrix.version }} +# tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }} diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index c15c9ea..c749b5f 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -73,31 +73,31 @@ jobs: tags: ${{ steps.meta-others.outputs.tags }} labels: ${{ steps.meta-others.outputs.labels }} - - Build_PHP_CentOS8_Test: - strategy: - matrix: - version: ['7.2', '7.3', '7.4', '8.0', '8.1'] - environment: - name: Build - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - ref: ${{ github.ref }} - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Build and push CentOS based Docker images - uses: docker/build-push-action@v6 - with: - push: false - context: centos8 - platforms: linux/amd64 - build-args: PHP_VERSION=${{ matrix.version }} - tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }} +# CentOS has been deprecated +# Build_PHP_CentOS8_Test: +# strategy: +# matrix: +# version: ['7.2', '7.3', '7.4', '8.0', '8.1'] +# environment: +# name: Build +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v4 +# with: +# ref: ${{ github.ref }} +# +# - name: Set up QEMU +# uses: docker/setup-qemu-action@v3 +# +# - name: Set up Docker Buildx +# uses: docker/setup-buildx-action@v3 +# +# - name: Build and push CentOS based Docker images +# uses: docker/build-push-action@v6 +# with: +# push: false +# context: centos8 +# platforms: linux/amd64 +# build-args: PHP_VERSION=${{ matrix.version }} +# tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }} From 23190d645b289d69ea9a77dd02de778051c38e5d Mon Sep 17 00:00:00 2001 From: pablojmarti Date: Mon, 28 Jul 2025 13:57:09 -0400 Subject: [PATCH 2/2] Removes the job instead of commenting it out, removes CentOS from documentation --- .github/workflows/build.yaml | 34 ------------------------------- .github/workflows/test-build.yaml | 29 -------------------------- README.md | 4 ++-- 3 files changed, 2 insertions(+), 65 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 059f6fc..ec6ce08 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -88,37 +88,3 @@ jobs: tags: ${{ steps.meta-others.outputs.tags }} labels: ${{ steps.meta-others.outputs.labels }} -# CentOS images have been deprecated -# Build_PHP_CentOS8: -# strategy: -# matrix: -# version: ['7.2', '7.3', '7.4', '8.0', '8.1'] -# environment: -# name: Build -# runs-on: ubuntu-latest -# steps: -# - name: Checkout -# uses: actions/checkout@v4 -# with: -# ref: ${{ github.ref }} -# -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v3 -# -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 -# -# - name: Login to DockerHub -# uses: docker/login-action@v3 -# with: -# username: ${{ secrets.DOCKERHUB_USERNAME }} -# password: ${{ secrets.DOCKERHUB_TOKEN }} -# -# - name: Build and push CentOS based Docker images -# uses: docker/build-push-action@v6 -# with: -# push: true -# context: centos8 -# platforms: linux/amd64 -# build-args: PHP_VERSION=${{ matrix.version }} -# tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }} diff --git a/.github/workflows/test-build.yaml b/.github/workflows/test-build.yaml index c749b5f..3144fbd 100644 --- a/.github/workflows/test-build.yaml +++ b/.github/workflows/test-build.yaml @@ -72,32 +72,3 @@ jobs: UBUNTU_RELEASE_NAME=${{ matrix.ubuntu-release-name }} tags: ${{ steps.meta-others.outputs.tags }} labels: ${{ steps.meta-others.outputs.labels }} - -# CentOS has been deprecated -# Build_PHP_CentOS8_Test: -# strategy: -# matrix: -# version: ['7.2', '7.3', '7.4', '8.0', '8.1'] -# environment: -# name: Build -# runs-on: ubuntu-latest -# steps: -# - name: Checkout -# uses: actions/checkout@v4 -# with: -# ref: ${{ github.ref }} -# -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v3 -# -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 -# -# - name: Build and push CentOS based Docker images -# uses: docker/build-push-action@v6 -# with: -# push: false -# context: centos8 -# platforms: linux/amd64 -# build-args: PHP_VERSION=${{ matrix.version }} -# tags: ${{ secrets.IMAGE_NAME }}:${{ matrix.version }} diff --git a/README.md b/README.md index db4652a..db49e0a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Base PHP -This image is the parent for a number of downstream images that make use of PHP either as a commandline tool or for php-fpm. The images are created from a number of base operating systems including CentOS 7, Rocky Linux 8 and Ubuntu 22.04 and 24.04. The non-Ubuntu based images are now deprecated and will be replaced with Ubuntu based images over time. This image is meant to be minimal and aims to support the needs of a WordPress ecosystem. The images are offered in both x86_64 and arm64 architectures. +This image is the parent for a number of downstream images that make use of PHP either as a commandline tool or for php-fpm. The images are created from a number of base operating systems including Rocky Linux 8 and Ubuntu 22.04 and 24.04. The non-Ubuntu based images are now deprecated and will be replaced with Ubuntu based images over time. This image is meant to be minimal and aims to support the needs of a WordPress ecosystem. The images are offered in both x86_64 and arm64 architectures. ## Usage @@ -8,7 +8,7 @@ This image, by itself, is not particularly useful. When run it passes arguments ## Building -There are currently a number of images being built for the different operating systems. This image is built with support for PHP 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 and 8.4. Note that we do not build CentOS/Rocky Linux based images beyond 8.1 and they will be removed in the future. +There are currently a number of images being built for the different operating systems. This image is built with support for PHP 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2, 8.3 and 8.4. Note that we do not build Rocky Linux based images beyond 8.1 and they will be removed in the future. Also note that CentOS/RL based images are not being pushed to ghcr.io!