diff --git a/.gitea/workflows/pr.yml b/.gitea/workflows/pr.yml index aad0ed6..c557378 100644 --- a/.gitea/workflows/pr.yml +++ b/.gitea/workflows/pr.yml @@ -60,19 +60,11 @@ jobs: echo "pr_number=$(echo $GITHUB_REF | grep -oP 'refs/pull/\K[0-9]+')" >> $GITHUB_OUTPUT echo "short_sha=$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_OUTPUT - - name: Login to Registry - run: | - docker login ${{ env.REGISTRY }} -u ${{ secrets.DOCKER_LOGIN }} -p ${{ secrets.DOCKER_PASSWORD }} - - name: Build Docker image for PR - env: - DOCKER_BUILDKIT: 1 run: | IMAGE_TAG="pr-${{ steps.info.outputs.pr_number }}-${{ steps.info.outputs.short_sha }}" docker build \ --target runner \ - --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache \ - --cache-to type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache,mode=max \ --build-arg GIT_COMMIT=$GITHUB_SHA \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${IMAGE_TAG} \ . diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index b4ca687..caa9890 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -109,13 +109,9 @@ jobs: - name: Build test-capable image if: steps.commit.outputs.committed == 'true' - env: - DOCKER_BUILDKIT: 1 run: | docker build \ --target test-runner \ - --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache-test \ - --cache-to type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache-test,mode=max \ --build-arg GIT_COMMIT=${{ github.sha }} \ -t ${{ env.IMAGE_NAME }}-test:${{ steps.version.outputs.new_version }} \ . @@ -131,13 +127,9 @@ jobs: - name: Build production image if: steps.commit.outputs.committed == 'true' - env: - DOCKER_BUILDKIT: 1 run: | docker build \ --target runner \ - --cache-from type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache \ - --cache-to type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:cache,mode=max \ --build-arg GIT_COMMIT=${{ github.sha }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.version.outputs.new_version }} \ -t ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest \