root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '2.1.x' into 2.2.x

This commit is contained in:
Madhura Bhave 2020-04-03 10:11:04 -07:00
parent 20c04bc63c a0a0d28582
commit 2b862d2409
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ci/images/setup.sh
View File

@ -27,9 +27,8 @@ test -f /opt/openjdk/bin/javac
########################################################### ###########################################################
# DOCKER # DOCKER
########################################################### ###########################################################
DOCKER_URL=$( ./get-docker-url.sh )
cd / cd /
DOCKER_URL=$( ./get-docker-url.sh )
curl -L ${DOCKER_URL} | tar zx curl -L ${DOCKER_URL} | tar zx
mv /docker/* /bin/ mv /docker/* /bin/
chmod +x /bin/docker* chmod +x /bin/docker*

1
ci/images/spring-boot-ci-image/Dockerfile
View File

@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java8 RUN ./setup.sh java8
ADD get-docker-url.sh /get-docker-url.sh
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH

1
ci/images/spring-boot-jdk11-ci-image/Dockerfile
View File

@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java11 RUN ./setup.sh java11
ADD get-docker-url.sh /get-docker-url.sh
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH

1
ci/images/spring-boot-jdk14-ci-image/Dockerfile
View File

@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219
ADD setup.sh /setup.sh ADD setup.sh /setup.sh
ADD get-jdk-url.sh /get-jdk-url.sh ADD get-jdk-url.sh /get-jdk-url.sh
RUN ./setup.sh java14 RUN ./setup.sh java14
ADD get-docker-url.sh /get-docker-url.sh
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH