Skip to content

S
spring-boot
Commit a0a0d285 authored by Madhura Bhave's avatar Madhura Bhave
Browse files
Options

Add get-docker-url script to image before executing it

parent bbf05364
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
ci/images/setup.sh
View file @ a0a0d285
...@@ -27,9 +27,8 @@ test -f /opt/openjdk/bin/javac ...@@ -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*
......
ci/images/spring-boot-ci-image/Dockerfile
View file @ a0a0d285
...@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219 ...@@ -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
......
ci/images/spring-boot-jdk11-ci-image/Dockerfile
View file @ a0a0d285
...@@ -3,6 +3,7 @@ FROM ubuntu:bionic-20200219 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment