From 0cf13cdee19788a28fa772f09d2b1c91b9a212e8 Mon Sep 17 00:00:00 2001 From: Evans Mike Date: Fri, 5 May 2023 12:39:27 +0100 Subject: [PATCH] fix: why? --- .github/workflows/build-singbox-docker.yml | 52 +++++++++++----------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/build-singbox-docker.yml b/.github/workflows/build-singbox-docker.yml index b6de8fc..5d7fe4c 100644 --- a/.github/workflows/build-singbox-docker.yml +++ b/.github/workflows/build-singbox-docker.yml @@ -30,32 +30,6 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Setup QEMU for Docker Buildx uses: docker/setup-qemu-action@v2 - - name: Select Dockerfile - run: | - if [[ "${{ matrix.buildType }}" == "full" ]]; then - if [[ "${{ matrix.distro }}" == "distroless" ]]; then - cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.distroless.full" Dockerfile - echo "tag_postfix=full-distroless" >> $GITHUB_OUTPUT - else - cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.full" Dockerfile - echo "tag_postfix=full" >> $GITHUB_OUTPUT - fi - elif [[ "${{ matrix.buildType }}" == "minimized" ]]; then - if [[ "${{ matrix.distro }}" == "distroless" ]]; then - cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.distroless.minimized" Dockerfile - echo "tag_postfix=mini-distroless" >> $GITHUB_OUTPUT - else - cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.minimized" Dockerfile - echo "tag_postfix=mini" >> $GITHUB_OUTPUT - fi - else - if [[ "${{ matrix.distro }}" == "distroless" ]]; then - cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.distroless.standard" Dockerfile - echo "tag_postfix=distroless" >> $GITHUB_OUTPUT - else - cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.standard" Dockerfile - fi - fi - name: Login to Docker Hub Container Registry uses: docker/login-action@v2 with: @@ -66,6 +40,32 @@ jobs: uses: docker/metadata-action@v4 with: images: etnperlong/sing-box + - name: Select Dockerfile + run: | + if [[ "${{ matrix.buildType }}" == "full" ]]; then + if [[ "${{ matrix.distro }}" == "distroless" ]]; then + cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.distroless.full" "$GITHUB_WORKSPACE/Dockerfile" + echo "tag_postfix=full-distroless" >> $GITHUB_OUTPUT + else + cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.full" "$GITHUB_WORKSPACE/Dockerfile" + echo "tag_postfix=full" >> $GITHUB_OUTPUT + fi + elif [[ "${{ matrix.buildType }}" == "minimized" ]]; then + if [[ "${{ matrix.distro }}" == "distroless" ]]; then + cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.distroless.minimized" "$GITHUB_WORKSPACE/Dockerfile" + echo "tag_postfix=mini-distroless" >> $GITHUB_OUTPUT + else + cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.minimized" "$GITHUB_WORKSPACE/Dockerfile" + echo "tag_postfix=mini" >> $GITHUB_OUTPUT + fi + else + if [[ "${{ matrix.distro }}" == "distroless" ]]; then + cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.distroless.standard" "$GITHUB_WORKSPACE/Dockerfile" + echo "tag_postfix=distroless" >> $GITHUB_OUTPUT + else + cp "$GITHUB_WORKSPACE/action/dockerfiles/Dockerfile.standard" "$GITHUB_WORKSPACE/Dockerfile" + fi + fi - name: Get tag to build id: tag run: |