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:
parent
1480dd81eb
commit
c5a7704774
|
|
@ -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() {
|
||||
mkdir -p /sys/fs/cgroup
|
||||
|
|
@ -86,4 +86,4 @@ stop_docker() {
|
|||
|
||||
kill -TERM $pid
|
||||
wait $pid
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,5 +52,3 @@ curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_VERSI
|
|||
chmod +x entrykit && \
|
||||
mv entrykit /bin/entrykit && \
|
||||
entrykit --symlink
|
||||
|
||||
curl https://raw.githubusercontent.com/concourse/docker-image-resource/v1.0.0/assets/common.sh > /docker-lib.sh
|
||||
|
|
|
|||
|
|
@ -5,5 +5,6 @@ RUN ./setup.sh java8
|
|||
|
||||
ENV JAVA_HOME /opt/openjdk
|
||||
ENV PATH $JAVA_HOME/bin:$PATH
|
||||
ADD docker-lib.sh /docker-lib.sh
|
||||
|
||||
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]
|
||||
|
|
|
|||
|
|
@ -5,5 +5,6 @@ RUN ./setup.sh java10
|
|||
|
||||
ENV JAVA_HOME /opt/openjdk
|
||||
ENV PATH $JAVA_HOME/bin:$PATH
|
||||
ADD docker-lib.sh /docker-lib.sh
|
||||
|
||||
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]
|
||||
|
|
|
|||
|
|
@ -5,5 +5,6 @@ RUN ./setup.sh java9
|
|||
|
||||
ENV JAVA_HOME /opt/openjdk
|
||||
ENV PATH $JAVA_HOME/bin:$PATH
|
||||
ADD docker-lib.sh /docker-lib.sh
|
||||
|
||||
ENTRYPOINT [ "switch", "shell=/bin/bash", "--", "codep", "/bin/docker daemon" ]
|
||||
|
|
|
|||
Loading…
Reference in New Issue