Merge branch '2.0.x'

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", \

ci/images/spring-boot-jdk11-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", \

ci/pipeline.yml

@@ -105,10 +105,12 @@ 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-jdk11-ci-image
     params:
-      build: ci-images-git-repo/ci/images/spring-boot-jdk11-ci-image
+      build: ci-images-git-repo/ci/images
+      dockerfile: spring-boot-jdk11-ci-image/Dockerfile
 - name: build
   serial: true
   public: true