diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5ad2f4..9121a4d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -192,26 +192,25 @@ jobs: uses: docker/setup-buildx-action@v2 - name: Login to Docker Registry - if: ${{ env.REGISTRY != '' }} uses: docker/login-action@v2 with: registry: ${{ env.REGISTRY }} username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - + - name: Extract metadata for Docker id: meta run: | if [ "${{ github.ref_type }}" = "tag" ]; then - echo "tags=${{ env.IMAGE_NAME }}:${{ github.ref_name }},${{ env.IMAGE_NAME }}:latest" >> $GITHUB_OUTPUT + echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }},${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" = "refs/heads/main" ]; then - echo "tags=${{ env.IMAGE_NAME }}:latest,${{ env.IMAGE_NAME }}:$(date +%Y%m%d)" >> $GITHUB_OUTPUT + echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$(date +%Y%m%d)" >> $GITHUB_OUTPUT elif [ "${{ github.ref }}" = "refs/heads/development" ]; then - echo "tags=${{ env.IMAGE_NAME }}:development,${{ env.IMAGE_NAME }}:$(date +%Y%m%d)" >> $GITHUB_OUTPUT + echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:development,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:$(date +%Y%m%d)" >> $GITHUB_OUTPUT else - echo "tags=${{ env.IMAGE_NAME }}:pr-$(echo ${{ github.ref }} | sed 's/refs\/heads\///' | tr '/' '-')" >> $GITHUB_OUTPUT + echo "tags=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:pr-$(echo ${{ github.ref }} | sed 's/refs\/heads\///' | tr '/' '-')" >> $GITHUB_OUTPUT fi - + - name: Build Docker image uses: docker/build-push-action@v4 with: @@ -221,8 +220,7 @@ jobs: build-args: | BINARY_NAME=${{ needs.detect-project.outputs.project-name }} tags: ${{ steps.meta.outputs.tags }} - push: ${{ env.REGISTRY != '' }} - load: ${{ env.REGISTRY == '' }} + push: true summary: name: Workflow Summary