diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index 3f9cd4b29b2..379fa491962 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -12,19 +12,24 @@ # See the License for the specific language governing permissions and # limitations under the License. -all: build +all: all-build REGISTRY ?= staging-k8s.gcr.io -IMAGE ?= debian-base +IMAGE ?= $(REGISTRY)/debian-base BUILD_IMAGE ?= debian-build TAG ?= 0.3.2 TAR_FILE ?= rootfs.tar ARCH?=amd64 +ALL_ARCH = amd64 arm arm64 ppc64le s390x + TEMP_DIR:=$(shell mktemp -d) QEMUVERSION=v2.9.1 +# This option is for running docker manifest command +export DOCKER_CLI_EXPERIMENTAL := enabled + ifeq ($(ARCH),amd64) BASEIMAGE?=debian:stretch endif @@ -45,6 +50,23 @@ ifeq ($(ARCH),s390x) QEMUARCH=s390x endif +sub-build-%: + $(MAKE) ARCH=$* build + +all-build: $(addprefix sub-build-,$(ALL_ARCH)) + +sub-push-image-%: + $(MAKE) ARCH=$* push + +all-push-images: $(addprefix sub-push-image-,$(ALL_ARCH)) + +all-push: all-push-images push-manifest + +push-manifest: + docker manifest create --amend $(IMAGE):$(TAG) $(shell echo $(ALL_ARCH) | sed -e "s~[^ ]*~$(IMAGE)\-&:$(TAG)~g") + @for arch in $(ALL_ARCH); do docker manifest annotate --arch $${arch} ${IMAGE}:${TAG} ${IMAGE}-$${arch}:${TAG}; done + docker manifest push ${IMAGE}:${TAG} + build: clean cp ./* $(TEMP_DIR) cat Dockerfile.build \ @@ -69,13 +91,13 @@ endif docker build --pull -t $(BUILD_IMAGE) -f $(TEMP_DIR)/Dockerfile.build $(TEMP_DIR) docker create --name $(BUILD_IMAGE) $(BUILD_IMAGE) docker export $(BUILD_IMAGE) > $(TEMP_DIR)/$(TAR_FILE) - docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) + docker build -t $(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) rm -rf $(TEMP_DIR) push: build - docker push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) + docker push $(IMAGE)-$(ARCH):$(TAG) clean: - docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true + docker rmi -f $(IMAGE)-$(ARCH):$(TAG) || true docker rmi -f $(BUILD_IMAGE) || true docker rm -f $(BUILD_IMAGE) || true