add build-args to buildx-docker push task/

springernature · Sep 7, 2023 · 724b78c · 724b78c
1 parent b0e6ac5
commit 724b78c
Show file tree

Hide file tree

Showing 11 changed files with 310 additions and 152 deletions.
diff --git a/e2e/concourse/artifacts/pipelineExpected.yml b/e2e/concourse/artifacts/pipelineExpected.yml
@@ -446,13 +446,13 @@ jobs:
       - name: tagList
       - name: docker_build
       params:
-        BUILD_ARG_A: a
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_B: b
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        A: a
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
+        B: b
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -465,13 +465,25 @@ jobs:
             --provenance false \
             --platform linux/amd64 \
             --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            --build-arg A \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg B \
+            --build-arg RUNNING_IN_CI \
             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) \
+            --build-arg A \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg B \
+            --build-arg RUNNING_IN_CI \
             docker_build/e2e/concourse/artifacts
         path: /bin/sh
     privileged: true
@@ -513,13 +525,13 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_A: a
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_B: b
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        A: a
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
+        B: b
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:

diff --git a/e2e/concourse/deploy-katee/pipelineExpected.yml b/e2e/concourse/deploy-katee/pipelineExpected.yml
@@ -96,11 +96,11 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -113,13 +113,21 @@ jobs:
             --provenance false \
             --platform linux/amd64 \
             --tag eu.gcr.io/halfpipe-io/cache/halfpipe-team/someImage:$(cat git/.git/ref) \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg RUNNING_IN_CI \
             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) \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg RUNNING_IN_CI \
             git/e2e/concourse/deploy-katee
         path: /bin/sh
     privileged: true
@@ -160,11 +168,11 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:

diff --git a/e2e/concourse/docker-push-paths/pipelineExpected.yml b/e2e/concourse/docker-push-paths/pipelineExpected.yml
@@ -43,11 +43,11 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -60,13 +60,21 @@ jobs:
             --provenance false \
             --platform linux/amd64 \
             --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg RUNNING_IN_CI \
             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) \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg RUNNING_IN_CI \
             git/e2e/concourse/docker-push-paths/some/build/dir
         path: /bin/sh
     privileged: true
@@ -107,11 +115,11 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -169,11 +177,11 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -186,13 +194,21 @@ jobs:
             --provenance false \
             --platform linux/amd64 \
             --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe:$(cat git/.git/ref) \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg RUNNING_IN_CI \
             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) \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg RUNNING_IN_CI \
             git/e2e/concourse/docker-push-paths
         path: /bin/sh
     privileged: true
@@ -233,11 +249,11 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:

diff --git a/e2e/concourse/docker-push-with-docker-trigger/pipelineExpected.yml b/e2e/concourse/docker-push-with-docker-trigger/pipelineExpected.yml
@@ -50,13 +50,13 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_A: a
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_B: b
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        A: a
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
+        B: b
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -69,13 +69,25 @@ jobs:
             --provenance false \
             --platform linux/amd64 \
             --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            --build-arg A \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg B \
+            --build-arg RUNNING_IN_CI \
             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) \
+            --build-arg A \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg B \
+            --build-arg RUNNING_IN_CI \
             git/e2e/concourse/docker-push-with-docker-trigger
         path: /bin/sh
     privileged: true
@@ -116,13 +128,13 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_A: a
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_B: b
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        A: a
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
+        B: b
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:

diff --git a/e2e/concourse/docker-push-with-pipeline-trigger/pipelineExpected.yml b/e2e/concourse/docker-push-with-pipeline-trigger/pipelineExpected.yml
@@ -48,13 +48,13 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_A: a
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_B: b
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        A: a
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
+        B: b
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args:
@@ -67,13 +67,25 @@ jobs:
             --provenance false \
             --platform linux/amd64 \
             --tag eu.gcr.io/halfpipe-io/cache/springerplatformengineering/halfpipe-fly:$(cat git/.git/ref) \
+            --build-arg A \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg B \
+            --build-arg RUNNING_IN_CI \
             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) \
+            --build-arg A \
+            --build-arg ARTIFACTORY_PASSWORD \
+            --build-arg ARTIFACTORY_URL \
+            --build-arg ARTIFACTORY_USERNAME \
+            --build-arg B \
+            --build-arg RUNNING_IN_CI \
             git/e2e/concourse/docker-push-with-pipeline-trigger
         path: /bin/sh
     privileged: true
@@ -114,13 +126,13 @@ jobs:
       - name: git
       - name: tagList
       params:
-        BUILD_ARG_A: a
-        BUILD_ARG_ARTIFACTORY_PASSWORD: ((artifactory.password))
-        BUILD_ARG_ARTIFACTORY_URL: ((artifactory.url))
-        BUILD_ARG_ARTIFACTORY_USERNAME: ((artifactory.username))
-        BUILD_ARG_B: b
-        BUILD_ARG_RUNNING_IN_CI: "true"
+        A: a
+        ARTIFACTORY_PASSWORD: ((artifactory.password))
+        ARTIFACTORY_URL: ((artifactory.url))
+        ARTIFACTORY_USERNAME: ((artifactory.username))
+        B: b
         DOCKER_CONFIG_JSON: ((halfpipe-gcr.docker_config))
+        RUNNING_IN_CI: "true"
       platform: linux
       run:
         args: