diff --git a/ci/images/docker-lib.sh b/ci/images/docker-lib.sh index 6689357dfc9..579f02ca03a 100644 --- a/ci/images/docker-lib.sh +++ b/ci/images/docker-lib.sh @@ -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 -} \ No newline at end of file +} diff --git a/ci/images/setup.sh b/ci/images/setup.sh index 0b713baf2ce..5030ae27729 100755 --- a/ci/images/setup.sh +++ b/ci/images/setup.sh @@ -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 diff --git a/ci/images/spring-boot-ci-image/Dockerfile b/ci/images/spring-boot-ci-image/Dockerfile index 51557fad0f5..8367030419d 100644 --- a/ci/images/spring-boot-ci-image/Dockerfile +++ b/ci/images/spring-boot-ci-image/Dockerfile @@ -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" ] diff --git a/ci/images/spring-boot-jdk10-ci-image/Dockerfile b/ci/images/spring-boot-jdk10-ci-image/Dockerfile index e96eb65961a..fd74cb22740 100644 --- a/ci/images/spring-boot-jdk10-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk10-ci-image/Dockerfile @@ -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" ] diff --git a/ci/images/spring-boot-jdk9-ci-image/Dockerfile b/ci/images/spring-boot-jdk9-ci-image/Dockerfile index b1a23e2560d..183720cdc06 100644 --- a/ci/images/spring-boot-jdk9-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk9-ci-image/Dockerfile @@ -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" ]