Skip to content

Commit 7797b68

Browse files
authored
Merge pull request #671 from buildo/use-registry-image
Use registry-image instead of docker-image
2 parents 14525d9 + 2c08b5e commit 7797b68

File tree

2 files changed

+17
-24
lines changed

2 files changed

+17
-24
lines changed

ci/pipeline.yml

+14-16
Original file line numberDiff line numberDiff line change
@@ -161,29 +161,33 @@ resources:
161161
- ci/docs.yml
162162

163163
- name: postgres
164-
type: docker-image
164+
type: registry-image
165165
icon: docker
166+
check_every: 24h
166167
source:
167168
repository: postgres
168169
tag: "16.1-alpine"
169170

170171
- name: mysql
171-
type: docker-image
172+
type: registry-image
172173
icon: docker
174+
check_every: 24h
173175
source:
174176
repository: mysql
175177
tag: "8"
176178

177179
- name: scala-sbt
178-
type: docker-image
180+
type: registry-image
179181
icon: docker
182+
check_every: 24h
180183
source:
181184
repository: buildo/scala-sbt-alpine
182185
tag: 8_2.13.6_1.5.5
183186

184187
- name: hseeberger-scala-sbt
185-
type: docker-image
188+
type: registry-image
186189
icon: docker
190+
check_every: 24h
187191
source:
188192
repository: hseeberger/scala-sbt
189193
tag: 8u282_1.5.5_2.13.6
@@ -243,14 +247,11 @@ jobs:
243247
resource: master
244248
trigger: true
245249
- get: postgres
246-
params:
247-
save: true
250+
params: { format: oci }
248251
- get: mysql
249-
params:
250-
save: true
252+
params: { format: oci }
251253
- get: scala-sbt
252-
params:
253-
save: true
254+
params: { format: oci }
254255
- task: test
255256
file: retro/toctoc/ci/test.yml
256257
privileged: true
@@ -410,14 +411,11 @@ jobs:
410411
trigger: true
411412
version: every
412413
- get: postgres
413-
params:
414-
save: true
414+
params: { format: oci }
415415
- get: mysql
416-
params:
417-
save: true
416+
params: { format: oci }
418417
- get: scala-sbt
419-
params:
420-
save: true
418+
params: { format: oci }
421419
- put: toctoc-pr
422420
params:
423421
path: retro

toctoc/ci/test.yml

+3-8
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,9 @@ run:
2222
- -ceux
2323
- |
2424
# Use images cached by concourse
25-
docker load -i postgres/image
26-
docker tag "$(cat postgres/image-id)" "$(cat postgres/repository):$(cat postgres/tag)"
27-
28-
docker load -i mysql/image
29-
docker tag "$(cat mysql/image-id)" "$(cat mysql/repository):$(cat mysql/tag)"
30-
31-
docker load -i scala-sbt/image
32-
docker tag "$(cat scala-sbt/image-id)" "$(cat scala-sbt/repository):$(cat scala-sbt/tag)"
25+
docker load -i postgres/image.tar
26+
docker load -i mysql/image.tar
27+
docker load -i scala-sbt/image.tar
3328
3429
# Run the tests container and its dependencies.
3530
export PROJECT_PATH="$PWD/retro"

0 commit comments

Comments
 (0)