From b8de01b86cad762faef37b6512f9819108f904e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 9 Aug 2023 11:04:56 +0200 Subject: [PATCH] Simplify Docker build action.# --- .../build-and-push-docker-images.yml | 50 ++----------------- 1 file changed, 3 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build-and-push-docker-images.yml b/.github/workflows/build-and-push-docker-images.yml index 3452f35..1f63272 100644 --- a/.github/workflows/build-and-push-docker-images.yml +++ b/.github/workflows/build-and-push-docker-images.yml @@ -37,25 +37,10 @@ jobs: build-args: VERSION=${{ env.VERSION }} file: ./docker/Eps.dockerfile tags: ${{ steps.meta_hyper.outputs.tags }} - push: false + push: true load: true labels: | kiprotect.hyper.image.revision=${{ github.sha }} - - name: Sign and push versioned Hyper image - uses: sudo-bot/action-docker-sign@latest - with: - image-ref: ${{fromJSON(steps.meta_hyper.outputs.json).tags[0]}} - private-key-id: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY_IDENTIFIER }} - private-key: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY }} - private-key-passphrase: ${{ secrets.DOCKER_HUB_DCT_PASSPHRASE }} - - name: Sign and push latest Hyper image - uses: sudo-bot/action-docker-sign@latest - with: - image-ref: ${{fromJSON(steps.meta_hyper.outputs.json).tags[1]}} - private-key-id: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY_IDENTIFIER }} - private-key: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY }} - private-key-passphrase: ${{ secrets.DOCKER_HUB_DCT_PASSPHRASE }} - - name: Create sd image tag id: meta_sd uses: docker/metadata-action@v3 @@ -67,25 +52,10 @@ jobs: build-args: VERSION=${{ env.VERSION }} file: ./docker/Sd.dockerfile tags: ${{ steps.meta_sd.outputs.tags }} - push: false + push: true load: true labels: | kiprotect.hyper-sd.image.revision=${{ github.sha }} - - name: Sign and push sd versioned image - uses: sudo-bot/action-docker-sign@latest - with: - image-ref: ${{fromJSON(steps.meta_sd.outputs.json).tags[0]}} - private-key-id: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY_IDENTIFIER }} - private-key: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY }} - private-key-passphrase: ${{ secrets.DOCKER_HUB_DCT_PASSPHRASE }} - - name: Sign and push sd latest image - uses: sudo-bot/action-docker-sign@latest - with: - image-ref: ${{fromJSON(steps.meta_sd.outputs.json).tags[1]}} - private-key-id: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY_IDENTIFIER }} - private-key: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY }} - private-key-passphrase: ${{ secrets.DOCKER_HUB_DCT_PASSPHRASE }} - - name: Create proxy image tag id: meta_proxy uses: docker/metadata-action@v3 @@ -97,21 +67,7 @@ jobs: build-args: VERSION=${{ env.VERSION }} file: ./docker/Proxy.dockerfile tags: ${{ steps.meta_proxy.outputs.tags }} - push: false + push: true load: true labels: | kiprotect.hyper-proxy.image.revision=${{ github.sha }} - - name: Sign and push proxy versioned image - uses: sudo-bot/action-docker-sign@latest - with: - image-ref: ${{fromJSON(steps.meta_proxy.outputs.json).tags[0]}} - private-key-id: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY_IDENTIFIER }} - private-key: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY }} - private-key-passphrase: ${{ secrets.DOCKER_HUB_DCT_PASSPHRASE }} - - name: Sign and push proxy latest image - uses: sudo-bot/action-docker-sign@latest - with: - image-ref: ${{fromJSON(steps.meta_proxy.outputs.json).tags[1]}} - private-key-id: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY_IDENTIFIER }} - private-key: ${{ secrets.DOCKER_HUB_DCT_PRIVATE_KEY }} - private-key-passphrase: ${{ secrets.DOCKER_HUB_DCT_PASSPHRASE }} \ No newline at end of file