Skip to content

Commit 9620165

Browse files
committed
Use registry-image instead of docker-image
1 parent 14525d9 commit 9620165

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

ci/pipeline.yml

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

163163
- name: postgres
164-
type: docker-image
164+
type: registry-image
165165
icon: docker
166166
source:
167167
repository: postgres
168168
tag: "16.1-alpine"
169169

170170
- name: mysql
171-
type: docker-image
171+
type: registry-image
172172
icon: docker
173173
source:
174174
repository: mysql
175175
tag: "8"
176176

177177
- name: scala-sbt
178-
type: docker-image
178+
type: registry-image
179179
icon: docker
180180
source:
181181
repository: buildo/scala-sbt-alpine
182182
tag: 8_2.13.6_1.5.5
183183

184184
- name: hseeberger-scala-sbt
185-
type: docker-image
185+
type: registry-image
186186
icon: docker
187187
source:
188188
repository: hseeberger/scala-sbt
@@ -243,14 +243,11 @@ jobs:
243243
resource: master
244244
trigger: true
245245
- get: postgres
246-
params:
247-
save: true
246+
params: { format: oci }
248247
- get: mysql
249-
params:
250-
save: true
248+
params: { format: oci }
251249
- get: scala-sbt
252-
params:
253-
save: true
250+
params: { format: oci }
254251
- task: test
255252
file: retro/toctoc/ci/test.yml
256253
privileged: true
@@ -410,14 +407,11 @@ jobs:
410407
trigger: true
411408
version: every
412409
- get: postgres
413-
params:
414-
save: true
410+
params: { format: oci }
415411
- get: mysql
416-
params:
417-
save: true
412+
params: { format: oci }
418413
- get: scala-sbt
419-
params:
420-
save: true
414+
params: { format: oci }
421415
- put: toctoc-pr
422416
params:
423417
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)