Use new bosh/cli docker image. Use new concourse resource_type primitive

[#131001637] Signed-off-by: Tyler Schultz <[email protected]>
cloudfoundry · Oct 5, 2016 · 281ef97 · 281ef97
1 parent e854d76
commit 281ef97
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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