From 05e64c8ba0e88b463fdc2bbebf5894140241e973 Mon Sep 17 00:00:00 2001 From: xiangzihao <460888207@qq.com> Date: Sun, 4 Aug 2024 10:13:08 +0800 Subject: [PATCH] [Chore] Fix push docker ci error (#16418) * fix push docker ci error --- .github/actions/maximize-build-space | 1 + .github/workflows/publish-docker.yaml | 34 ++++++++++++++++++++------- .gitmodules | 3 +++ 3 files changed, 29 insertions(+), 9 deletions(-) create mode 160000 .github/actions/maximize-build-space diff --git a/.github/actions/maximize-build-space b/.github/actions/maximize-build-space new file mode 160000 index 0000000000..fc881a613a --- /dev/null +++ b/.github/actions/maximize-build-space @@ -0,0 +1 @@ +Subproject commit fc881a613ad2a34aca9c9624518214ebc21dfc0c diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml index d00174589f..1c67bf6d86 100644 --- a/.github/workflows/publish-docker.yaml +++ b/.github/workflows/publish-docker.yaml @@ -33,6 +33,19 @@ jobs: packages: write timeout-minutes: 30 steps: + - uses: actions/checkout@v4 + with: + submodules: true + - name: Maximize runner space + uses: ./.github/actions/maximize-build-space + with: + root-reserve-mb: 30720 + temp-reserve-mb: 10240 + remove-dotnet: 'true' + remove-android: 'true' + remove-haskell: 'true' + remove-codeql: 'true' + remove-docker-images: 'true' - uses: actions/checkout@v4 - name: Cache local Maven repository uses: actions/cache@v4 @@ -42,29 +55,32 @@ jobs: restore-keys: ${{ runner.os }}-maven- - name: Set environment variables run: | - if [[ ${{ github.event_name }} == "release" ]]; then + if [[ ${{ github.event_name }} == "push" ]]; then + echo "DOCKER_REGISTRY=docker.io" >> $GITHUB_ENV + echo "DOCKER_USERNAME=${{ secrets.DOCKERHUB_USER }}" >> $GITHUB_ENV + echo "DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }}" >> $GITHUB_ENV + echo "HUB=apache" >> $GITHUB_ENV + echo "DOCKER_TAG=dev" >> $GITHUB_ENV + elif [[ ${{ github.event_name }} == "release" ]]; then echo "DOCKER_REGISTRY=docker.io" >> $GITHUB_ENV echo "DOCKER_USERNAME=${{ secrets.DOCKERHUB_USER }}" >> $GITHUB_ENV echo "DOCKER_PASSWORD=${{ secrets.DOCKERHUB_TOKEN }}" >> $GITHUB_ENV echo "HUB=apache" >> $GITHUB_ENV echo "DOCKER_TAG=${{ github.event.release.tag_name }}" >> $GITHUB_ENV else - echo "DOCKER_REGISTRY=ghcr.io/apache/dolphinscheduler" >> $GITHUB_ENV - echo "DOCKER_USERNAME=${{ github.actor }}" >> $GITHUB_ENV - echo "DOCKER_PASSWORD=${{ secrets.GITHUB_TOKEN }}" >> $GITHUB_ENV - echo "HUB=ghcr.io/apache/dolphinscheduler" >> $GITHUB_ENV - echo "DOCKER_TAG=${{ github.sha }}" >> $GITHUB_ENV + echo "unknown event name: ${{ github.event_name }}" + exit 2 fi - name: Log in to the Container registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ env.DOCKER_USERNAME }} password: ${{ env.DOCKER_PASSWORD }} - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Build and push docker images run: | ./mvnw -B clean deploy \ diff --git a/.gitmodules b/.gitmodules index 0467f26649..5569298c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule ".github/actions/workflow-telemetry-action"] path = .github/actions/workflow-telemetry-action url = https://github.com/catchpoint/workflow-telemetry-action +[submodule ".github/actions/maximize-build-space"] + path = .github/actions/maximize-build-space + url = https://github.com/easimon/maximize-build-space