From a0a0d2858278579ae04026b534a9e62f0b9d73c2 Mon Sep 17 00:00:00 2001
From: Madhura Bhave <mbhave@pivotal.io>
Date: Fri, 3 Apr 2020 10:09:02 -0700
Subject: [PATCH] Add get-docker-url script to image before executing it

---
 ci/images/setup.sh                              | 3 +--
 ci/images/spring-boot-ci-image/Dockerfile       | 1 +
 ci/images/spring-boot-jdk11-ci-image/Dockerfile | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index b2309333d3..e8726b1e76 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -27,9 +27,8 @@ test -f /opt/openjdk/bin/javac
 ###########################################################
 # DOCKER
 ###########################################################
-DOCKER_URL=$( ./get-docker-url.sh )
-
 cd /
+DOCKER_URL=$( ./get-docker-url.sh )
 curl -L ${DOCKER_URL} | tar zx
 mv /docker/* /bin/
 chmod +x /bin/docker*
diff --git a/ci/images/spring-boot-ci-image/Dockerfile b/ci/images/spring-boot-ci-image/Dockerfile
index 6a5e770069..aed989fb70 100644
--- a/ci/images/spring-boot-ci-image/Dockerfile
+++ b/ci/images/spring-boot-ci-image/Dockerfile
@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 RUN ./setup.sh java8
+ADD get-docker-url.sh /get-docker-url.sh
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH
diff --git a/ci/images/spring-boot-jdk11-ci-image/Dockerfile b/ci/images/spring-boot-jdk11-ci-image/Dockerfile
index 30aaffe873..05b0ab4272 100644
--- a/ci/images/spring-boot-jdk11-ci-image/Dockerfile
+++ b/ci/images/spring-boot-jdk11-ci-image/Dockerfile
@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
 ADD setup.sh /setup.sh
 ADD get-jdk-url.sh /get-jdk-url.sh
 RUN ./setup.sh java11
+ADD get-docker-url.sh /get-docker-url.sh
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH