Skip to content

Commit d7c376a

Browse files
committed
Merge branch '2.1.x' into 2.2.x
2 parents 2b862d2 + d5a3310 commit d7c376a

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
22

33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
5-
RUN ./setup.sh java8
65
ADD get-docker-url.sh /get-docker-url.sh
6+
RUN ./setup.sh java8
77

88
ENV JAVA_HOME /opt/openjdk
99
ENV PATH $JAVA_HOME/bin:$PATH

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
22

33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
5-
RUN ./setup.sh java11
65
ADD get-docker-url.sh /get-docker-url.sh
6+
RUN ./setup.sh java11
77

88
ENV JAVA_HOME /opt/openjdk
99
ENV PATH $JAVA_HOME/bin:$PATH

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ FROM ubuntu:bionic-20200219
22

33
ADD setup.sh /setup.sh
44
ADD get-jdk-url.sh /get-jdk-url.sh
5-
RUN ./setup.sh java14
65
ADD get-docker-url.sh /get-docker-url.sh
6+
RUN ./setup.sh java14
77

88
ENV JAVA_HOME /opt/openjdk
99
ENV PATH $JAVA_HOME/bin:$PATH

0 commit comments

Comments
 (0)