fix simon's mess

springernature · Sep 6, 2023 · 35f2541 · 35f2541
1 parent 5f4f21c
commit 35f2541
Show file tree

Hide file tree

Showing 9 changed files with 202 additions and 14 deletions.
diff --git a/e2e/concourse/artifacts/pipelineExpected.yml b/e2e/concourse/artifacts/pipelineExpected.yml
@@ -459,7 +459,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f docker_build/e2e/concourse/artifacts/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) --push --provenance=false docker_build/e2e/concourse/artifacts
+          echo $ docker buildx build \
+            -f docker_build/e2e/concourse/artifacts/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            docker_build/e2e/concourse/artifacts
+          docker buildx build \
+            -f docker_build/e2e/concourse/artifacts/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            docker_build/e2e/concourse/artifacts
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/deploy-katee/pipelineExpected.yml b/e2e/concourse/deploy-katee/pipelineExpected.yml
@@ -107,7 +107,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/deploy-katee/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/halfpipe-team/someImage:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/deploy-katee
+          echo $ docker buildx build \
+            -f git/e2e/concourse/deploy-katee/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/halfpipe-team/someImage:$(cat git/.git/ref) \
+            git/e2e/concourse/deploy-katee
+          docker buildx build \
+            -f git/e2e/concourse/deploy-katee/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/halfpipe-team/someImage:$(cat git/.git/ref) \
+            git/e2e/concourse/deploy-katee
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/docker-push-paths/pipelineExpected.yml b/e2e/concourse/docker-push-paths/pipelineExpected.yml
@@ -54,7 +54,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push-paths/dockerfiles/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push-paths/some/build/dir
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push-paths/dockerfiles/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-paths/some/build/dir
+          docker buildx build \
+            -f git/e2e/concourse/docker-push-paths/dockerfiles/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-paths/some/build/dir
         path: /bin/sh
     privileged: true
     task: build
@@ -167,7 +180,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push-paths/dockerfiles/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push-paths
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push-paths/dockerfiles/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-paths
+          docker buildx build \
+            -f git/e2e/concourse/docker-push-paths/dockerfiles/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-paths
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/docker-push-with-docker-trigger/pipelineExpected.yml b/e2e/concourse/docker-push-with-docker-trigger/pipelineExpected.yml
@@ -63,7 +63,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push-with-docker-trigger/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push-with-docker-trigger
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push-with-docker-trigger/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-docker-trigger
+          docker buildx build \
+            -f git/e2e/concourse/docker-push-with-docker-trigger/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-docker-trigger
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/docker-push-with-pipeline-trigger/pipelineExpected.yml b/e2e/concourse/docker-push-with-pipeline-trigger/pipelineExpected.yml
@@ -61,7 +61,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push-with-pipeline-trigger/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push-with-pipeline-trigger
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push-with-pipeline-trigger/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-pipeline-trigger
+          docker buildx build \
+            -f git/e2e/concourse/docker-push-with-pipeline-trigger/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-pipeline-trigger
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/docker-push-with-restore-artifacts/pipelineExpected.yml b/e2e/concourse/docker-push-with-restore-artifacts/pipelineExpected.yml
@@ -258,7 +258,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f docker_build/e2e/concourse/docker-push-with-restore-artifacts/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image1:$(cat git/.git/ref) --push --provenance=false docker_build/e2e/concourse/docker-push-with-restore-artifacts
+          echo $ docker buildx build \
+            -f docker_build/e2e/concourse/docker-push-with-restore-artifacts/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image1:$(cat git/.git/ref) \
+            docker_build/e2e/concourse/docker-push-with-restore-artifacts
+          docker buildx build \
+            -f docker_build/e2e/concourse/docker-push-with-restore-artifacts/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image1:$(cat git/.git/ref) \
+            docker_build/e2e/concourse/docker-push-with-restore-artifacts
         path: /bin/sh
     privileged: true
     task: build
@@ -432,7 +445,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f docker_build/e2e/concourse/docker-push-with-restore-artifacts/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image2:$(cat git/.git/ref) --push --provenance=false docker_build/e2e/concourse/docker-push-with-restore-artifacts
+          echo $ docker buildx build \
+            -f docker_build/e2e/concourse/docker-push-with-restore-artifacts/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image2:$(cat git/.git/ref) \
+            docker_build/e2e/concourse/docker-push-with-restore-artifacts
+          docker buildx build \
+            -f docker_build/e2e/concourse/docker-push-with-restore-artifacts/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image2:$(cat git/.git/ref) \
+            docker_build/e2e/concourse/docker-push-with-restore-artifacts
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/docker-push-with-update-pipeline/pipelineExpected.yml b/e2e/concourse/docker-push-with-update-pipeline/pipelineExpected.yml
@@ -109,7 +109,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push-with-update-pipeline/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image1:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push-with-update-pipeline
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push-with-update-pipeline/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image1:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-update-pipeline
+          docker buildx build \
+            -f git/e2e/concourse/docker-push-with-update-pipeline/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image1:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-update-pipeline
         path: /bin/sh
     privileged: true
     task: build
@@ -233,7 +246,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push-with-update-pipeline/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image2:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push-with-update-pipeline
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push-with-update-pipeline/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image2:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-update-pipeline
+          docker buildx build \
+            -f git/e2e/concourse/docker-push-with-update-pipeline/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/image2:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push-with-update-pipeline
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/docker-push/pipelineExpected.yml b/e2e/concourse/docker-push/pipelineExpected.yml
@@ -56,7 +56,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push
+          docker buildx build \
+            -f git/e2e/concourse/docker-push/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push
         path: /bin/sh
     privileged: true
     task: build
@@ -173,7 +186,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/docker-push
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push
+          docker buildx build \
+            -f git/e2e/concourse/docker-push/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) \
+            git/e2e/concourse/docker-push
         path: /bin/sh
     privileged: true
     task: build
@@ -290,7 +316,26 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/docker-push/Dockerfile --platform linux/amd64,linux/arm64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:buildcache --push --provenance=false --cache-from=type=registry,ref=eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:buildcache --cache-to=type=inline git/e2e/concourse/docker-push
+          echo $ docker buildx build \
+            -f git/e2e/concourse/docker-push/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64,linux/arm64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:buildcache \
+            --cache-from type=registry,ref=eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:buildcache \
+            --cache-to type=inline \
+            git/e2e/concourse/docker-push
+          docker buildx build \
+            -f git/e2e/concourse/docker-push/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64,linux/arm64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:$(cat git/.git/ref) \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:buildcache \
+            --cache-from type=registry,ref=eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe_fly:buildcache \
+            --cache-to type=inline \
+            git/e2e/concourse/docker-push
         path: /bin/sh
     privileged: true
     task: build

diff --git a/e2e/concourse/timer-trigger/pipelineExpected.yml b/e2e/concourse/timer-trigger/pipelineExpected.yml
@@ -61,7 +61,20 @@ jobs:
         - -c
         - |-
           echo $DOCKER_CONFIG_JSON > ~/.docker/config.json
-          docker buildx build -f git/e2e/concourse/timer-trigger/Dockerfile --platform linux/amd64 -t eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) --push --provenance=false git/e2e/concourse/timer-trigger
+          echo $ docker buildx build \
+            -f git/e2e/concourse/timer-trigger/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/timer-trigger
+          docker buildx build \
+            -f git/e2e/concourse/timer-trigger/Dockerfile \
+            --push \
+            --provenance false \
+            --platform linux/amd64 \
+            --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            git/e2e/concourse/timer-trigger
         path: /bin/sh
     privileged: true
     task: build