Skip to content

Commit 2b862d2

Browse files
committed
Merge branch '2.1.x' into 2.2.x
2 parents 20c04bc + a0a0d28 commit 2b862d2

File tree

4 files changed

+4
-2
lines changed

4 files changed

+4
-2
lines changed

ci/images/setup.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ test -f /opt/openjdk/bin/javac
2727
###########################################################
2828
# DOCKER
2929
###########################################################
30-
DOCKER_URL=$( ./get-docker-url.sh )
31-
3230
cd /
31+
DOCKER_URL=$( ./get-docker-url.sh )
3332
curl -L ${DOCKER_URL} | tar zx
3433
mv /docker/* /bin/
3534
chmod +x /bin/docker*

ci/images/spring-boot-ci-image/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
RUN ./setup.sh java8
6+
ADD get-docker-url.sh /get-docker-url.sh
67

78
ENV JAVA_HOME /opt/openjdk
89
ENV PATH $JAVA_HOME/bin:$PATH

ci/images/spring-boot-jdk11-ci-image/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
RUN ./setup.sh java11
6+
ADD get-docker-url.sh /get-docker-url.sh
67

78
ENV JAVA_HOME /opt/openjdk
89
ENV PATH $JAVA_HOME/bin:$PATH

ci/images/spring-boot-jdk14-ci-image/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
55
RUN ./setup.sh java14
6+
ADD get-docker-url.sh /get-docker-url.sh
67

78
ENV JAVA_HOME /opt/openjdk
89
ENV PATH $JAVA_HOME/bin:$PATH

0 commit comments

Comments
 (0)