@@ -175,17 +175,6 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
175
175
--label revision=$(REV) \
176
176
.; \
177
177
done; \
178
- if [ -f "$$dockerfile_windows_hp" ]; then \
179
- docker buildx build --push \
180
- --tag $(IMAGE_NAME):$$tag-amd64-windows-hp \
181
- --platform=windows/amd64 \
182
- --file $$dockerfile_windows_hp \
183
- --build-arg binary=./bin/$*.exe \
184
- --label revision=$(REV) \
185
- .; \
186
- docker manifest create --amend $(IMAGE_NAME):$$tag-windows-hp $(IMAGE_NAME):$$tag-amd64-windows-hp; \
187
- docker manifest push -p $(IMAGE_NAME):$$tag-windows-hp; \
188
- fi; \
189
178
images=$$(echo "$$build_platforms" | tr ';' '\n' | while read -r os arch buildx_platform suffix base_image addon_image; do \
190
179
escaped_base_image=$${base_image/:/-}; \
191
180
escaped_buildx_platform=$${buildx_platform//\//-}; \
@@ -203,6 +192,17 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
203
192
fi; \
204
193
done; \
205
194
docker manifest push -p $(IMAGE_NAME):$$tag; \
195
+ if [ -f "$$dockerfile_windows_hp" ]; then \
196
+ docker buildx build --push \
197
+ --tag $(IMAGE_NAME):$$tag-amd64-windows-hp \
198
+ --platform=windows/amd64 \
199
+ --file $$dockerfile_windows_hp \
200
+ --build-arg binary=./bin/$*.exe \
201
+ --label revision=$(REV) \
202
+ .; \
203
+ docker manifest create --amend $(IMAGE_NAME):$$tag-windows-hp $(IMAGE_NAME):$$tag-amd64-windows-hp; \
204
+ docker manifest push -p $(IMAGE_NAME):$$tag-windows-hp; \
205
+ fi; \
206
206
}; \
207
207
if [ $(PULL_BASE_REF) = "master" ] || [ $(PULL_BASE_REF) = "main" ]; then \
208
208
: "creating or overwriting canary image"; \
0 commit comments