From 1bab38d3e838b48fea9ac6cfe848ac820e35ef66 Mon Sep 17 00:00:00 2001 From: Bruce Dou Date: Tue, 4 Feb 2025 11:18:16 +0000 Subject: [PATCH] upgrade ci --- .github/workflows/build_latest_alpine_images.yml | 12 ++++++------ .github/workflows/build_latest_dev_images.yml | 12 ++++++------ .github/workflows/build_latest_images.yml | 12 ++++++------ .github/workflows/build_versioned_alpine_images.yml | 12 ++++++------ .github/workflows/build_versioned_dev_images.yml | 12 ++++++------ .github/workflows/build_versioned_images.yml | 12 ++++++------ config/25.2.0.yml | 4 ++-- dockerfiles/25.2.0/php8.2/alpine/Dockerfile | 2 +- dockerfiles/25.2.0/php8.2/cli/Dockerfile | 2 +- dockerfiles/25.2.0/php8.3/alpine/Dockerfile | 2 +- dockerfiles/25.2.0/php8.3/cli/Dockerfile | 2 +- dockerfiles/latest/php8.2/alpine/Dockerfile | 2 +- dockerfiles/latest/php8.3/alpine/Dockerfile | 2 +- 13 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/workflows/build_latest_alpine_images.yml b/.github/workflows/build_latest_alpine_images.yml index 68bdf7b..9de85c7 100644 --- a/.github/workflows/build_latest_alpine_images.yml +++ b/.github/workflows/build_latest_alpine_images.yml @@ -17,19 +17,19 @@ jobs: 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 - 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.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -42,11 +42,11 @@ jobs: - name: Build and push Docker image openswoole/swoole:php${{ matrix.php }}-alpine id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: dockerfiles/latest/php${{ matrix.php }}/alpine/Dockerfile - platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le,linux/s390x + platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x push: true tags: ${{ steps.set_full_names.outputs.full_names }} diff --git a/.github/workflows/build_latest_dev_images.yml b/.github/workflows/build_latest_dev_images.yml index 3e82a02..d257840 100644 --- a/.github/workflows/build_latest_dev_images.yml +++ b/.github/workflows/build_latest_dev_images.yml @@ -17,19 +17,19 @@ jobs: 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 - 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.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -42,11 +42,11 @@ jobs: - name: Build and push Docker image openswoole/swoole:php${{ matrix.php }}-dev id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: dockerfiles/latest/php${{ matrix.php }}/cli/Dockerfile - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le + platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x push: true tags: ${{ steps.set_full_names.outputs.full_names }} build-args: DEV_MODE=true diff --git a/.github/workflows/build_latest_images.yml b/.github/workflows/build_latest_images.yml index 587bc67..c3cf411 100644 --- a/.github/workflows/build_latest_images.yml +++ b/.github/workflows/build_latest_images.yml @@ -17,19 +17,19 @@ jobs: 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 - 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.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -42,11 +42,11 @@ jobs: - name: Build and push Docker image openswoole/swoole:php${{ matrix.php }} id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: dockerfiles/latest/php${{ matrix.php }}/cli/Dockerfile - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le + platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x push: true tags: ${{ steps.set_full_names.outputs.full_names }} diff --git a/.github/workflows/build_versioned_alpine_images.yml b/.github/workflows/build_versioned_alpine_images.yml index 3ea586a..0bde27c 100644 --- a/.github/workflows/build_versioned_alpine_images.yml +++ b/.github/workflows/build_versioned_alpine_images.yml @@ -23,19 +23,19 @@ jobs: 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 - 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.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -64,11 +64,11 @@ jobs: - name: Build and push Docker image openswoole/swoole:${{ steps.params.outputs.branch_name }}-php${{ matrix.php }}-alpine id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: dockerfiles/${{ steps.params.outputs.branch_name }}/php${{ matrix.php }}/alpine/Dockerfile - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le + platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x push: true tags: ${{ steps.params.outputs.full_names }} diff --git a/.github/workflows/build_versioned_dev_images.yml b/.github/workflows/build_versioned_dev_images.yml index d1e246c..7ed90d1 100644 --- a/.github/workflows/build_versioned_dev_images.yml +++ b/.github/workflows/build_versioned_dev_images.yml @@ -22,19 +22,19 @@ jobs: 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 - 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.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -63,11 +63,11 @@ jobs: - name: Build and push Docker image openswoole/swoole:${{ steps.params.outputs.branch_name }}-php${{ matrix.php }}-dev id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: dockerfiles/${{ steps.params.outputs.branch_name }}/php${{ matrix.php }}/cli/Dockerfile - platforms: linux/amd64,linux/arm/v7,linux/arm64/v8,linux/ppc64le + platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x push: true tags: ${{ steps.params.outputs.full_names }} build-args: DEV_MODE=true diff --git a/.github/workflows/build_versioned_images.yml b/.github/workflows/build_versioned_images.yml index eb01005..d4d0fe8 100644 --- a/.github/workflows/build_versioned_images.yml +++ b/.github/workflows/build_versioned_images.yml @@ -22,19 +22,19 @@ jobs: 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 - 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.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} @@ -63,11 +63,11 @@ jobs: - name: Build and push Docker image openswoole/swoole:${{ steps.params.outputs.branch_name }}-php${{ matrix.php }} id: docker_build - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v5 with: context: . file: dockerfiles/${{ steps.params.outputs.branch_name }}/php${{ matrix.php }}/cli/Dockerfile - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le + platforms: linux/amd64,linux/arm64/v8,linux/ppc64le,linux/s390x push: true tags: ${{ steps.params.outputs.full_names }} diff --git a/config/25.2.0.yml b/config/25.2.0.yml index 17e7840..1370a00 100644 --- a/config/25.2.0.yml +++ b/config/25.2.0.yml @@ -3,8 +3,8 @@ # status: "under development" php: - - "8.2.26" - - "8.3.15" + - "8.2.0" + - "8.3.0" - "8.4.2" image: composer: diff --git a/dockerfiles/25.2.0/php8.2/alpine/Dockerfile b/dockerfiles/25.2.0/php8.2/alpine/Dockerfile index da57bf5..2ff7677 100644 --- a/dockerfiles/25.2.0/php8.2/alpine/Dockerfile +++ b/dockerfiles/25.2.0/php8.2/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.26-cli-alpine3.20 +FROM php:8.2.0-cli-alpine3.16 RUN \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ diff --git a/dockerfiles/25.2.0/php8.2/cli/Dockerfile b/dockerfiles/25.2.0/php8.2/cli/Dockerfile index 6c4e7e8..5a6656c 100644 --- a/dockerfiles/25.2.0/php8.2/cli/Dockerfile +++ b/dockerfiles/25.2.0/php8.2/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.26-cli +FROM php:8.2.0-cli ENV DEBIAN_FRONTEND=noninteractive ENV TERM=xterm-color diff --git a/dockerfiles/25.2.0/php8.3/alpine/Dockerfile b/dockerfiles/25.2.0/php8.3/alpine/Dockerfile index fceaaff..4f405e8 100644 --- a/dockerfiles/25.2.0/php8.3/alpine/Dockerfile +++ b/dockerfiles/25.2.0/php8.3/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.15-cli-alpine3.20 +FROM php:8.3.0-cli-alpine3.18 RUN \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ diff --git a/dockerfiles/25.2.0/php8.3/cli/Dockerfile b/dockerfiles/25.2.0/php8.3/cli/Dockerfile index 22006f3..96111e4 100644 --- a/dockerfiles/25.2.0/php8.3/cli/Dockerfile +++ b/dockerfiles/25.2.0/php8.3/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3.15-cli +FROM php:8.3.0-cli ENV DEBIAN_FRONTEND=noninteractive ENV TERM=xterm-color diff --git a/dockerfiles/latest/php8.2/alpine/Dockerfile b/dockerfiles/latest/php8.2/alpine/Dockerfile index bd472fc..f636c03 100644 --- a/dockerfiles/latest/php8.2/alpine/Dockerfile +++ b/dockerfiles/latest/php8.2/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2-cli-alpine3.20 +FROM php:8.2-cli-alpine3.16 RUN \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ diff --git a/dockerfiles/latest/php8.3/alpine/Dockerfile b/dockerfiles/latest/php8.3/alpine/Dockerfile index ac50f98..91d3174 100644 --- a/dockerfiles/latest/php8.3/alpine/Dockerfile +++ b/dockerfiles/latest/php8.3/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.3-cli-alpine3.20 +FROM php:8.3-cli-alpine3.18 RUN \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \