From 9b764c28bd75f151404378e1129404464015b606 Mon Sep 17 00:00:00 2001 From: aias00 Date: Sun, 13 Oct 2024 13:36:01 +0800 Subject: [PATCH] [type:fix] fix docker ci error (#5702) * [type:fix] fix docker ci error * [type:fix] fix docker ci error --- .github/workflows/ci.yml | 2 +- .github/workflows/codeql-analysis.yml | 2 +- .../workflows/docker-publish-dockerhub.yml | 2 +- .github/workflows/docker-publish.yml | 2 +- .github/workflows/e2e-k8s.yml | 22 +++++++++++++------ .../workflows/integrated-test-k8s-ingress.yml | 4 ++-- .github/workflows/integrated-test.yml | 6 +++-- .github/workflows/k8s-examples-http.yml | 6 +++-- 8 files changed, 29 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1875a78fbf89..d4a32f928667 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -61,7 +61,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 if: steps.filter.outputs.changed == 'true' with: java-version: ${{ matrix.java }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ad76d91439c5..c8bb4ffc6010 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -42,7 +42,7 @@ jobs: with: submodules: true - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/docker-publish-dockerhub.yml b/.github/workflows/docker-publish-dockerhub.yml index 3873d49c56d6..0806b63d09d1 100644 --- a/.github/workflows/docker-publish-dockerhub.yml +++ b/.github/workflows/docker-publish-dockerhub.yml @@ -63,7 +63,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index ca43f3286c30..653c52449218 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -67,7 +67,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: 'temurin' diff --git a/.github/workflows/e2e-k8s.yml b/.github/workflows/e2e-k8s.yml index 08cd17a8b2b8..6f2dc3c3f2c7 100644 --- a/.github/workflows/e2e-k8s.yml +++ b/.github/workflows/e2e-k8s.yml @@ -34,7 +34,9 @@ jobs: run: | df --human-readable sudo apt clean - docker rmi $(docker image ls --all --quiet) + for image in $(docker image ls --all --quiet); do + docker rmi $image + done rm --recursive --force "$AGENT_TOOLSDIRECTORY" df --human-readable - uses: dorny/paths-filter@v2 @@ -55,12 +57,14 @@ jobs: run: | df --human-readable sudo apt clean - docker rmi $(docker image ls --all --quiet) + for image in $(docker image ls --all --quiet); do + docker rmi $image + done rm --recursive --force "$AGENT_TOOLSDIRECTORY" df --human-readable - name: Set up JDK 17 for Building ShenYu - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -124,7 +128,9 @@ jobs: run: | df --human-readable sudo apt clean - docker rmi $(docker image ls --all --quiet) + for image in $(docker image ls --all --quiet); do + docker rmi $image + done rm --recursive --force "$AGENT_TOOLSDIRECTORY" df --human-readable rm -rf /tmp/shenyu @@ -145,7 +151,7 @@ jobs: cp /etc/rancher/k3s/k3s.yaml ~/.kube/config - name: Set up JDK 17 for Building ShenYu - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' @@ -216,7 +222,9 @@ jobs: run: | df --human-readable sudo apt clean - docker rmi $(docker image ls --all --quiet) + for image in $(docker image ls --all --quiet); do + docker rmi $image + done rm --recursive --force "$AGENT_TOOLSDIRECTORY" df --human-readable rm -rf /tmp/shenyu @@ -237,7 +245,7 @@ jobs: cp /etc/rancher/k3s/k3s.yaml ~/.kube/config - name: Set up JDK 17 for Building ShenYu - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: '17' distribution: 'temurin' diff --git a/.github/workflows/integrated-test-k8s-ingress.yml b/.github/workflows/integrated-test-k8s-ingress.yml index 1ea2edd812cb..5c6c18d397d2 100644 --- a/.github/workflows/integrated-test-k8s-ingress.yml +++ b/.github/workflows/integrated-test-k8s-ingress.yml @@ -63,7 +63,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 if: steps.filter.outputs.changed == 'true' with: java-version: 17 @@ -90,7 +90,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 if: steps.filter.outputs.changed == 'true' with: java-version: 17 diff --git a/.github/workflows/integrated-test.yml b/.github/workflows/integrated-test.yml index 5789a63d191b..2adcb8c718d7 100644 --- a/.github/workflows/integrated-test.yml +++ b/.github/workflows/integrated-test.yml @@ -50,7 +50,9 @@ jobs: run: | df --human-readable sudo apt clean - docker rmi $(docker image ls --all --quiet) + for image in $(docker image ls --all --quiet); do + docker rmi $image + done rm --recursive --force "$AGENT_TOOLSDIRECTORY" df --human-readable - uses: dorny/paths-filter@v2 @@ -66,7 +68,7 @@ jobs: key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 if: steps.filter.outputs.changed == 'true' with: java-version: 17 diff --git a/.github/workflows/k8s-examples-http.yml b/.github/workflows/k8s-examples-http.yml index 7592b3a5b32b..7abe80126dac 100644 --- a/.github/workflows/k8s-examples-http.yml +++ b/.github/workflows/k8s-examples-http.yml @@ -34,7 +34,9 @@ jobs: run: | df --human-readable sudo apt clean - docker rmi $(docker image ls --all --quiet) + for image in $(docker image ls --all --quiet); do + docker rmi $image + done rm --recursive --force "$AGENT_TOOLSDIRECTORY" df --human-readable - @@ -61,7 +63,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 if: steps.filter.outputs.changed == 'true' with: java-version: 17