From f210e9c77f1dbdbcaa7b32cee38ee506f9548ed1 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 1 Nov 2018 12:53:31 +0000 Subject: [PATCH] Add local docker-lib.sh file when building CI images Closes gh-15058 --- ci/images/spring-boot-ci-image/Dockerfile | 2 +- ci/images/spring-boot-jdk10-ci-image/Dockerfile | 2 +- ci/images/spring-boot-jdk9-ci-image/Dockerfile | 2 +- ci/pipeline.yml | 9 ++++++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/images/spring-boot-ci-image/Dockerfile b/ci/images/spring-boot-ci-image/Dockerfile index 390dddd43f2..bbeb3927aef 100644 --- a/ci/images/spring-boot-ci-image/Dockerfile +++ b/ci/images/spring-boot-ci-image/Dockerfile @@ -24,7 +24,7 @@ RUN curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_V mv entrykit /bin/entrykit && \ entrykit --symlink -ADD https://raw.githubusercontent.com/spring-projects/spring-boot/master/ci/images/docker-lib.sh /docker-lib.sh +ADD docker-lib.sh /docker-lib.sh ENTRYPOINT [ \ "switch", \ diff --git a/ci/images/spring-boot-jdk10-ci-image/Dockerfile b/ci/images/spring-boot-jdk10-ci-image/Dockerfile index 27efc5b4a74..151d2e656b2 100644 --- a/ci/images/spring-boot-jdk10-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk10-ci-image/Dockerfile @@ -24,7 +24,7 @@ RUN curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_V mv entrykit /bin/entrykit && \ entrykit --symlink -ADD https://raw.githubusercontent.com/spring-projects/spring-boot/master/ci/images/docker-lib.sh /docker-lib.sh +ADD docker-lib.sh /docker-lib.sh ENTRYPOINT [ \ "switch", \ diff --git a/ci/images/spring-boot-jdk9-ci-image/Dockerfile b/ci/images/spring-boot-jdk9-ci-image/Dockerfile index 2c4884f53f2..d56ba5433e0 100644 --- a/ci/images/spring-boot-jdk9-ci-image/Dockerfile +++ b/ci/images/spring-boot-jdk9-ci-image/Dockerfile @@ -24,7 +24,7 @@ RUN curl -L https://github.com/progrium/entrykit/releases/download/v${ENTRYKIT_V mv entrykit /bin/entrykit && \ entrykit --symlink -ADD https://raw.githubusercontent.com/spring-projects/spring-boot/master/ci/images/docker-lib.sh /docker-lib.sh +ADD docker-lib.sh /docker-lib.sh ENTRYPOINT [ \ "switch", \ diff --git a/ci/pipeline.yml b/ci/pipeline.yml index a891605b248..30ee6d75778 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -119,13 +119,16 @@ jobs: trigger: true - put: spring-boot-ci-image params: - build: ci-images-git-repo/ci/images/spring-boot-ci-image + build: ci-images-git-repo/ci/images + dockerfile: spring-boot-ci-image/Dockerfile - put: spring-boot-jdk9-ci-image params: - build: ci-images-git-repo/ci/images/spring-boot-jdk9-ci-image + build: ci-images-git-repo/ci/images + dockerfile: spring-boot-jdk9-ci-image/Dockerfile - put: spring-boot-jdk10-ci-image params: - build: ci-images-git-repo/ci/images/spring-boot-jdk10-ci-image + build: ci-images-git-repo/ci/images + dockerfile: spring-boot-jdk10-ci-image/Dockerfile - name: build serial: true public: true