Skip to content

Commit 184964c

Browse files
build (docker): Use buildx imagetools to create single arch images
* Ref docker/build-push-action#1459 * Ref docker/buildx#1509 Signed-off-by: Mahendra Paipuri <mahendra.paipuri@gmail.com>
1 parent edae622 commit 184964c

2 files changed

Lines changed: 9 additions & 5 deletions

File tree

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ COPY build/config/redfish_proxy/redfish_proxy.yml /etc/redfish_proxy/config.yml
2424
COPY build/config/cacct/cacct.yml /etc/ceems/config.yml
2525
COPY LICENSE /LICENSE
2626

27-
ENV CEEMS_API_SERVER_CONFIG_FILE /etc/ceems_api_server/config.yml
28-
ENV CEEMS_LB_CONFIG_FILE /etc/ceems_lb/config.yml
29-
ENV REDFISH_PROXY_CONFIG_FILE /etc/redfish_proxy/config.yml
27+
ENV CEEMS_API_SERVER_CONFIG_FILE=/etc/ceems_api_server/config.yml
28+
ENV CEEMS_LB_CONFIG_FILE=/etc/ceems_lb/config.yml
29+
ENV REDFISH_PROXY_CONFIG_FILE=/etc/redfish_proxy/config.yml
3030

3131
RUN mkdir -p /var/lib/ceems && chown -R root:root /etc/ceems_exporter /var/lib/ceems /etc/ceems_api_server /etc/ceems_lb /etc/redfish_proxy && chmod +x /bin/liveness-probe.sh
3232

Makefile.common

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,14 @@ common-docker-pull: $(PULL_DOCKER_ARCHS)
285285
$(PULL_DOCKER_ARCHS): common-docker-pull-%:
286286
docker pull "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$*:$(SANITIZED_DOCKER_IMAGE_TAG)"
287287

288+
# Starting from Docker CLI v29, seems like provenance is defaulfed to true and hence,
289+
# create manifest does not work anymore as there is no one provenance layer even in
290+
# single layered image.
291+
# Ref: https://github.com/docker/build-push-action/issues/1459
292+
# Ref: https://github.com/docker/buildx/issues/1509
288293
.PHONY: common-docker-manifest
289294
common-docker-manifest:
290-
DOCKER_CLI_EXPERIMENTAL=enabled docker manifest create -a "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)" $(foreach ARCH,$(DOCKER_ARCHS),$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$(ARCH):$(SANITIZED_DOCKER_IMAGE_TAG))
291-
DOCKER_CLI_EXPERIMENTAL=enabled docker manifest push "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)"
295+
DOCKER_CLI_EXPERIMENTAL=enabled docker buildx imagetools create -t "$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME):$(SANITIZED_DOCKER_IMAGE_TAG)" $(foreach ARCH,$(DOCKER_ARCHS),$(DOCKER_REPO)/$(DOCKER_IMAGE_NAME)-linux-$(ARCH):$(SANITIZED_DOCKER_IMAGE_TAG))
292296

293297
.PHONY: updatevars
294298
updatevars:

0 commit comments

Comments
 (0)