diff --git a/ci/images/ci-image-jdk21/Dockerfile b/ci/images/ci-image-jdk21/Dockerfile index 7aa4cdd47aae..c13dea362bf7 100644 --- a/ci/images/ci-image-jdk21/Dockerfile +++ b/ci/images/ci-image-jdk21/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:jammy-20240111 +ARG DOCKER_PROXY_CACHE= +FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240111 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/images/ci-image/Dockerfile b/ci/images/ci-image/Dockerfile index 54e0bf3c970e..f660b06a0426 100644 --- a/ci/images/ci-image/Dockerfile +++ b/ci/images/ci-image/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:jammy-20240111 +ARG DOCKER_PROXY_CACHE= +FROM ${DOCKER_PROXY_CACHE}ubuntu:jammy-20240111 ADD setup.sh /setup.sh ADD get-jdk-url.sh /get-jdk-url.sh diff --git a/ci/parameters.yml b/ci/parameters.yml index 09c24f3c910a..16e49dffa10c 100644 --- a/ci/parameters.yml +++ b/ci/parameters.yml @@ -13,3 +13,4 @@ build-name: "spring-boot" concourse-url: "https://ci.spring.io" task-timeout: 2h00m final-release: false +dockerhub-proxy-cache: harbor-repo.vmware.com/dockerhub-proxy-cache/ \ No newline at end of file diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 46bc9e777450..259a56fff894 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -8,8 +8,8 @@ anchors: username: ((docker-hub-username)) password: ((docker-hub-password)) ci-registry-image-resource-source: &ci-registry-image-resource-source - username: ((docker-hub-username)) - password: ((docker-hub-password)) + username: ((harbor-registry-username)) + password: ((harbor-registry-password)) tag: ((milestone)) gradle-enterprise-task-params: &gradle-enterprise-task-params GRADLE_ENTERPRISE_ACCESS_KEY: ((gradle_enterprise_secret_access_key)) @@ -99,31 +99,31 @@ resource_types: type: registry-image source: <<: *registry-image-resource-source - repository: concourse/registry-image-resource - tag: 1.7.1 + repository: ((dockerhub-proxy-cache))concourse/registry-image-resource + tag: 1.9.0 - name: artifactory-resource type: registry-image source: <<: *registry-image-resource-source - repository: springio/artifactory-resource + repository: ((dockerhub-proxy-cache))springio/artifactory-resource tag: 0.0.18 - name: github-status-resource type: registry-image source: <<: *registry-image-resource-source - repository: dpb587/github-status-resource + repository: ((dockerhub-proxy-cache))dpb587/github-status-resource tag: master - name: slack-notification type: registry-image source: <<: *registry-image-resource-source - repository: cfcommunity/slack-notification-resource + repository: ((dockerhub-proxy-cache))cfcommunity/slack-notification-resource tag: latest - name: github-release type: registry-image source: <<: *registry-image-resource-source - repository: concourse/github-release-resource + repository: ((dockerhub-proxy-cache))concourse/github-release-resource tag: 1.8.0 resources: - name: git-repo @@ -168,18 +168,18 @@ resources: icon: docker source: <<: *ci-registry-image-resource-source - repository: ((docker-hub-organization))/((docker-hub-repository-prefix))-ci + repository: projects.registry.vmware.com/springboot/spring-boot-ci - name: ci-image-jdk21 type: registry-image icon: docker source: <<: *ci-registry-image-resource-source - repository: ((docker-hub-organization))/((docker-hub-repository-prefix))-ci-jdk21 + repository: projects.registry.vmware.com/springboot/spring-boot-ci-jdk21 - name: paketo-builder-base-image type: registry-image icon: docker source: - repository: paketobuildpacks/builder-jammy-base + repository: ((dockerhub-proxy-cache))paketobuildpacks/builder-jammy-base tag: latest - name: artifactory-repo type: artifactory-resource @@ -242,6 +242,7 @@ jobs: image: ci-image vars: ci-image-name: ci-image + dockerhub-proxy-cache: ((dockerhub-proxy-cache)) - task: build-ci-image-jdk21 privileged: true file: git-repo/ci/tasks/build-ci-image.yml @@ -249,6 +250,7 @@ jobs: image: ci-image-jdk21 vars: ci-image-name: ci-image-jdk21 + dockerhub-proxy-cache: ((dockerhub-proxy-cache)) - in_parallel: - put: ci-image params: @@ -481,6 +483,8 @@ jobs: <<: *artifactory-task-params - task: generate-changelog file: git-repo/ci/tasks/generate-changelog.yml + vars: + dockerhub-proxy-cache: ((dockerhub-proxy-cache)) params: RELEASE_TYPE: M GITHUB_USERNAME: ((github-username)) @@ -503,6 +507,8 @@ jobs: save_build_info: true - task: promote file: git-repo/ci/tasks/promote.yml + vars: + dockerhub-proxy-cache: ((dockerhub-proxy-cache)) params: RELEASE_TYPE: RC <<: *artifactory-task-params @@ -585,6 +591,8 @@ jobs: save_build_info: true - task: publish-to-sdkman file: git-repo/ci/tasks/publish-to-sdkman.yml + vars: + dockerhub-proxy-cache: ((dockerhub-proxy-cache)) params: <<: *sdkman-task-params RELEASE_TYPE: RELEASE diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml index a57af31acd9a..41945de8d1b4 100644 --- a/ci/tasks/build-ci-image.yml +++ b/ci/tasks/build-ci-image.yml @@ -3,8 +3,8 @@ platform: linux image_resource: type: registry-image source: - repository: concourse/oci-build-task - tag: 0.10.0 + tag: 0.11.1 + repository: ((dockerhub-proxy-cache))concourse/oci-build-task username: ((docker-hub-username)) password: ((docker-hub-password)) inputs: @@ -17,7 +17,7 @@ params: CONTEXT: ci-images-git-repo/ci/images DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile DOCKER_HUB_AUTH: ((docker-hub-auth)) - REGISTRY_MIRRORS: ((docker-hub-mirror)) + BUILD_ARG_DOCKER_PROXY_CACHE: ((dockerhub-proxy-cache)) run: path: /bin/sh args: diff --git a/ci/tasks/generate-changelog.yml b/ci/tasks/generate-changelog.yml index f4004743db92..0cc82f24dfd4 100755 --- a/ci/tasks/generate-changelog.yml +++ b/ci/tasks/generate-changelog.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: springio/github-changelog-generator + repository: ((dockerhub-proxy-cache))springio/github-changelog-generator tag: '0.0.8' username: ((docker-hub-username)) password: ((docker-hub-password)) diff --git a/ci/tasks/promote.yml b/ci/tasks/promote.yml index aa700a1bf11f..7a98ab8a0b05 100644 --- a/ci/tasks/promote.yml +++ b/ci/tasks/promote.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: springio/concourse-release-scripts + repository: ((dockerhub-proxy-cache))springio/concourse-release-scripts tag: '0.4.0' username: ((docker-hub-username)) password: ((docker-hub-password)) diff --git a/ci/tasks/publish-to-sdkman.yml b/ci/tasks/publish-to-sdkman.yml index 3b9fa93ebbb4..7a38099ccd63 100755 --- a/ci/tasks/publish-to-sdkman.yml +++ b/ci/tasks/publish-to-sdkman.yml @@ -3,7 +3,7 @@ platform: linux image_resource: type: registry-image source: - repository: springio/concourse-release-scripts + repository: ((dockerhub-proxy-cache))springio/concourse-release-scripts tag: '0.4.0' username: ((docker-hub-username)) password: ((docker-hub-password))