Skip to content

Commit 7aedb9e

Browse files
committed
Build CI image using oci-build-task resource
1 parent 5b1719c commit 7aedb9e

File tree

4 files changed

+50
-13
lines changed

4 files changed

+50
-13
lines changed

ci/parameters.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,7 @@ milestone: "5.3.x"
88
build-name: "spring-framework"
99
pipeline-name: "spring-framework"
1010
concourse-url: "https://ci.spring.io"
11+
registry-mirror-host: docker.repo.spring.io
12+
registry-mirror-username: ((artifactory-username))
13+
registry-mirror-password: ((artifactory-password))
1114
task-timeout: 1h00m

ci/pipeline.yml

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ anchors:
2424
username: ((docker-hub-username))
2525
password: ((docker-hub-password))
2626
tag: ((milestone))
27+
registry-mirror-vars: &registry-mirror-vars
28+
registry-mirror-host: ((registry-mirror-host))
29+
registry-mirror-username: ((registry-mirror-username))
30+
registry-mirror-password: ((registry-mirror-password))
2731
slack-fail-params: &slack-fail-params
2832
text: >
2933
:concourse-failed: <https://ci.spring.io/teams/${BUILD_TEAM_NAME}/pipelines/${BUILD_PIPELINE_NAME}/jobs/${BUILD_JOB_NAME}/builds/${BUILD_NAME}|${BUILD_PIPELINE_NAME} ${BUILD_JOB_NAME} failed!>
@@ -162,13 +166,20 @@ resources:
162166
jobs:
163167
- name: build-ci-images
164168
plan:
165-
- get: ci-images-git-repo
166-
trigger: true
167-
- in_parallel:
169+
- get: git-repo
170+
- get: ci-images-git-repo
171+
trigger: true
172+
- task: build-ci-image
173+
privileged: true
174+
file: git-repo/ci/tasks/build-ci-image.yml
175+
output_mapping:
176+
image: ci-image
177+
vars:
178+
ci-image-name: ci-image
179+
<<: *registry-mirror-vars
168180
- put: ci-image
169181
params:
170-
build: ci-images-git-repo/ci/images
171-
dockerfile: ci-images-git-repo/ci/images/ci-image/Dockerfile
182+
image: ci-image/image.tar
172183
- name: build
173184
serial: true
174185
public: true

ci/scripts/sync-to-maven-central.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

ci/tasks/build-ci-image.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
platform: linux
3+
image_resource:
4+
type: registry-image
5+
source:
6+
repository: concourse/oci-build-task
7+
tag: 0.9.1
8+
registry_mirror:
9+
host: ((registry-mirror-host))
10+
username: ((registry-mirror-username))
11+
password: ((registry-mirror-password))
12+
inputs:
13+
- name: ci-images-git-repo
14+
outputs:
15+
- name: image
16+
caches:
17+
- path: ci-image-cache
18+
params:
19+
CONTEXT: ci-images-git-repo/ci/images
20+
DOCKERFILE: ci-images-git-repo/ci/images/ci-image/Dockerfile
21+
DOCKER_HUB_AUTH: ((docker-hub-auth))
22+
run:
23+
path: /bin/sh
24+
args:
25+
- "-c"
26+
- |
27+
mkdir -p /root/.docker
28+
cat > /root/.docker/config.json <<EOF
29+
{ "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
30+
EOF
31+
build

0 commit comments

Comments
 (0)