Merge branch '2.1.x' into 2.2.x

Author: mbhave

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*

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

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

ci/images/spring-boot-jdk14-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 java14
+ADD get-docker-url.sh /get-docker-url.sh
 
 ENV JAVA_HOME /opt/openjdk
 ENV PATH $JAVA_HOME/bin:$PATH