From 281ef97040c00319c9b4588483e9434184f83ba6 Mon Sep 17 00:00:00 2001 From: Dennis Leon Date: Wed, 5 Oct 2016 09:58:12 -0700 Subject: [PATCH] Use new bosh/cli docker image. Use new concourse resource_type primitive [#131001637] Signed-off-by: Tyler Schultz --- ci/docker/build-docker-image.sh | 2 +- ci/run-acceptance-with-vm-in-container.sh | 2 +- ci/tasks/build-darwin.yml | 6 +++++- ci/tasks/build-linux.yml | 6 +++++- ci/tasks/test-acceptance.yml | 6 +++++- ci/tasks/test-integration.yml | 6 +++++- ci/tasks/test-unit.yml | 6 +++++- 7 files changed, 27 insertions(+), 7 deletions(-) diff --git a/ci/docker/build-docker-image.sh b/ci/docker/build-docker-image.sh index 3d3c89bab..ff5c74ddc 100755 --- a/ci/docker/build-docker-image.sh +++ b/ci/docker/build-docker-image.sh @@ -3,7 +3,7 @@ set -ex # Pushing to Docker Hub requires login -DOCKER_IMAGE=${DOCKER_IMAGE:-bosh/init} +DOCKER_IMAGE=${DOCKER_IMAGE:-bosh/cli} # To push to the Pivotal GoCD Docker Registry (behind firewall): # DOCKER_IMAGE=docker.gocd.cf-app.com:5000/bosh-init-container diff --git a/ci/run-acceptance-with-vm-in-container.sh b/ci/run-acceptance-with-vm-in-container.sh index 949ff1d40..72a9c2bc8 100755 --- a/ci/run-acceptance-with-vm-in-container.sh +++ b/ci/run-acceptance-with-vm-in-container.sh @@ -18,7 +18,7 @@ echo "ENV:" echo `env` # Pushing to Docker Hub requires login -DOCKER_IMAGE=${DOCKER_IMAGE:-bosh/init} +DOCKER_IMAGE=${DOCKER_IMAGE:-bosh/cli} # To push to the Pivotal GoCD Docker Registry (behind firewall): # DOCKER_IMAGE=docker.gocd.cf-app.com:5000/bosh-init-container diff --git a/ci/tasks/build-darwin.yml b/ci/tasks/build-darwin.yml index 00c68334c..eb2407890 100644 --- a/ci/tasks/build-darwin.yml +++ b/ci/tasks/build-darwin.yml @@ -1,7 +1,11 @@ --- platform: linux -image: docker:///bosh/init +image_resource: + type: docker-image + source: + repository: bosh/cli + tag: 'latest' inputs: - name: bosh-cli diff --git a/ci/tasks/build-linux.yml b/ci/tasks/build-linux.yml index c152b991d..501d18cb2 100644 --- a/ci/tasks/build-linux.yml +++ b/ci/tasks/build-linux.yml @@ -1,7 +1,11 @@ --- platform: linux -image: docker:///bosh/init +image_resource: + type: docker-image + source: + repository: bosh/cli + tag: 'latest' inputs: - name: bosh-cli diff --git a/ci/tasks/test-acceptance.yml b/ci/tasks/test-acceptance.yml index 8ee6215bb..a23324f8d 100644 --- a/ci/tasks/test-acceptance.yml +++ b/ci/tasks/test-acceptance.yml @@ -1,7 +1,11 @@ --- platform: linux -image: docker:///bosh/init +image_resource: + type: docker-image + source: + repository: bosh/cli + tag: 'latest' inputs: - name: bosh-cli diff --git a/ci/tasks/test-integration.yml b/ci/tasks/test-integration.yml index 1f2c2ce3e..05ff21399 100644 --- a/ci/tasks/test-integration.yml +++ b/ci/tasks/test-integration.yml @@ -1,7 +1,11 @@ --- platform: linux -image: docker:///bosh/init +image_resource: + type: docker-image + source: + repository: bosh/cli + tag: 'latest' inputs: - name: bosh-cli diff --git a/ci/tasks/test-unit.yml b/ci/tasks/test-unit.yml index e7209d4f0..bad65d5f2 100644 --- a/ci/tasks/test-unit.yml +++ b/ci/tasks/test-unit.yml @@ -1,7 +1,11 @@ --- platform: linux -image: docker:///bosh/init +image_resource: + type: docker-image + source: + repository: bosh/cli + tag: 'latest' inputs: - name: bosh-cli