Update docker scripts

[releng/global-jjb.git] / jjb / lf-docker-jobs.yaml

diff --git a/jjb/lf-docker-jobs.yaml b/jjb/lf-docker-jobs.yaml
index 220c225..9b8b731 100644 (file)
--- a/jjb/lf-docker-jobs.yaml
+++ b/jjb/lf-docker-jobs.yaml
@@ -10,7 +10,6 @@
     builders:
       - inject:
           properties-content: |
-            DOCKER_NAME={docker-name}
             DOCKER_ROOT={docker-root}
       - conditional-step:
           condition-kind: regex-match
@@ -37,8 +36,10 @@
       - inject:
           properties-content: |
             DOCKER_ARGS={docker-build-args}
+            DOCKER_NAME={docker-name}
             DOCKER_ROOT={docker-root}
             CONTAINER_PULL_REGISTRY={container-public-registry}
+            CONTAINER_PUSH_REGISTRY={container-push-registry}
       - shell: !include-raw-escape:
           - ../shell/docker-build.sh
 
@@ -137,12 +138,13 @@
       - shell: '{pre_docker_build_script}'
       - lf-docker-get-container-tag:
           docker-use-params-from: '{docker-use-params-from}'
-          docker-name: '{docker-name}'
           docker-root: '{docker-root}'
       - lf-docker-build:
           docker-build-args: '{docker-build-args}'
+          docker-name: '{docker-name}'
           docker-root: '{docker-root}'
           container-public-registry: '{container-public-registry}'
+          container-push-registry: '{container-push-registry}'
       - shell: '{post_docker_build_script}'
       - lf-provide-maven-settings-cleanup
 
@@ -173,12 +175,13 @@
       - shell: '{pre_docker_build_script}'
       - lf-docker-get-container-tag:
           docker-use-params-from: '{docker-use-params-from}'
-          docker-name: '{docker-name}'
           docker-root: '{docker-root}'
       - lf-docker-build:
           docker-build-args: '{docker-build-args}'
+          docker-name: '{docker-name}'
           docker-root: '{docker-root}'
           container-public-registry: '{container-public-registry}'
+          container-push-registry: '{container-push-registry}'
       - shell: '{post_docker_build_script}'
       # Provided all steps have already passed, push the docker image
       - lf-docker-push: