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

Use local docker-lib.sh 

Update the modified docker image build to use the local docker-lib.sh
file rather than grabbing it from the concourse github.

See gh-15158
This commit is contained in:
Phillip Webb 2018-11-12 20:39:05 -08:00
parent 1480dd81eb
commit c5a7704774
5 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ci/images/docker-lib.sh
View File

@ -1,4 +1,4 @@
# Ref: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh # Based on: https://github.com/concourse/docker-image-resource/blob/master/assets/common.sh
sanitize_cgroups() { sanitize_cgroups() {
mkdir -p /sys/fs/cgroup mkdir -p /sys/fs/cgroup
@ -86,4 +86,4 @@ stop_docker() {
kill -TERM $pid kill -TERM $pid
wait $pid wait $pid
} }

2
ci/images/setup.sh
View File

@ -52,5 +52,3 @@ curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSI
chmod +x entrykit && \ chmod +x entrykit && \
mv entrykit /bin/entrykit && \ mv entrykit /bin/entrykit && \
entrykit --symlink entrykit --symlink
curl https://raw.githubusercontent.com/concourse/docker-image-resource/v1.0.0/assets/common.sh > /docker-lib.sh

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

@ -5,5 +5,6 @@ RUN ./setup.sh java8
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH
ADD docker-lib.sh /docker-lib.sh
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ] ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

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

@ -5,5 +5,6 @@ RUN ./setup.sh java10
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH
ADD docker-lib.sh /docker-lib.sh
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ] ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]

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

@ -5,5 +5,6 @@ RUN ./setup.sh java9
ENV JAVA_HOME /opt/openjdk ENV JAVA_HOME /opt/openjdk
ENV PATH $JAVA_HOME/bin:$PATH ENV PATH $JAVA_HOME/bin:$PATH
ADD docker-lib.sh /docker-lib.sh
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ] ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]