Skip to content

Commit 9f18182

Browse files
committed
Pull the image after building it
You can't "load" and "push" a container at the same time, it turns out.
1 parent 7d54c1c commit 9f18182

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ jobs:
109109
build-args: channel=${{ matrix.channel }}
110110
pull: true
111111
push: true
112-
load: true
113112
tags: "${{ env.IMAGE_NAME }}:${{ github.run_id }}"
114113
cache-from: |-
115114
${{ env.IMAGE_NAME }}:${{ github.run_id }}
@@ -148,7 +147,6 @@ jobs:
148147
build-args: base_image=ghcr.io/integer32llc/rust-playground-ci-rust-nightly:sources--${{ github.run_id }}
149148
pull: true
150149
push: true
151-
load: true
152150
tags: "${{ env.IMAGE_NAME }}:${{ github.run_id }}"
153151
cache-from: |-
154152
${{ env.IMAGE_NAME }}:${{ github.run_id }}

.github/workflows/cron.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,13 @@ jobs:
113113
build-args: channel=${{ matrix.channel }}
114114
pull: true
115115
push: true
116-
load: true
117116
tags: "${{ env.IMAGE_NAME }}:${{ github.run_id }}"
118117
cache-from: |-
119118
${{ env.IMAGE_NAME }}:${{ github.run_id }}
120119
${{ env.IMAGE_NAME }}:latest
121120
cache-to: type=inline
121+
- name: Pull container
122+
run: docker pull ${{ env.IMAGE_NAME }}:${{ github.run_id }}
122123
- name: Rename container
123124
run: |-
124125
docker tag ${{ env.IMAGE_NAME }}:${{ github.run_id }} ${{ env.IMAGE_NAME }}
@@ -167,12 +168,13 @@ jobs:
167168
build-args: base_image=ghcr.io/integer32llc/rust-playground-ci-rust-nightly:sources--${{ github.run_id }}
168169
pull: true
169170
push: true
170-
load: true
171171
tags: "${{ env.IMAGE_NAME }}:${{ github.run_id }}"
172172
cache-from: |-
173173
${{ env.IMAGE_NAME }}:${{ github.run_id }}
174174
${{ env.IMAGE_NAME }}:latest
175175
cache-to: type=inline
176+
- name: Pull container
177+
run: docker pull ${{ env.IMAGE_NAME }}:${{ github.run_id }}
176178
- name: Rename container
177179
run: |-
178180
docker tag ${{ env.IMAGE_NAME }}:${{ github.run_id }} ${{ env.IMAGE_NAME }}

ci/workflows.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ components:
132132
channel=${{ matrix.channel }}
133133
pull: true
134134
push: true
135-
load: true
136135
tags: |-
137136
${{ env.IMAGE_NAME }}:${{ github.run_id }}
138137
cache-from: |-
@@ -162,7 +161,6 @@ components:
162161
base_image=ghcr.io/integer32llc/rust-playground-ci-rust-nightly:sources--${{ github.run_id }}
163162
pull: true
164163
push: true
165-
load: true
166164
tags: |-
167165
${{ env.IMAGE_NAME }}:${{ github.run_id }}
168166
cache-from: |-
@@ -189,6 +187,11 @@ components:
189187
docker tag ghcr.io/integer32llc/rust-playground-ci-tool-$t:${{ github.run_id }} $t
190188
done
191189
190+
- pull_current_container: &pull_current_container
191+
name: "Pull container"
192+
run: |-
193+
docker pull ${{ env.IMAGE_NAME }}:${{ github.run_id }}
194+
192195
- rename_current_container: &rename_current_container
193196
name: "Rename container"
194197
run: |-
@@ -483,6 +486,7 @@ workflows:
483486
- *build_compiler_containers_sources
484487
- *build_compiler_containers_final
485488

489+
- *pull_current_container
486490
- *rename_current_container
487491
- *push_current_container
488492

@@ -500,5 +504,6 @@ workflows:
500504
- *login_docker_hub
501505
- *build_tool_containers_final
502506

507+
- *pull_current_container
503508
- *rename_current_container
504509
- *push_current_container

0 commit comments

Comments
 (0)