From aa04081dc09b1133366dabc0d081b7c35c5451dc Mon Sep 17 00:00:00 2001 From: Stefan Prodan Date: Sat, 6 Jan 2018 12:15:16 +0200 Subject: [PATCH] added s390x removed curl --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ab5e6ba..0a7d0e0 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ NAME:=podinfo VERSION:=$(shell grep 'VERSION' pkg/version/version.go | awk '{ print $$4 }' | tr -d '"') DOCKER_IMAGE_NAME:=$(DOCKER_REPOSITORY)/$(NAME) GITCOMMIT:=$(shell git describe --dirty --always) -LINUX_ARCH:=amd64 arm arm64 ppc64le +LINUX_ARCH:=amd64 arm arm64 ppc64le s390x PLATFORMS:=$(subst $(SPACE),$(COMMA),$(foreach arch,$(LINUX_ARCH),linux/$(arch))) .PHONY: build @@ -62,7 +62,7 @@ docker-build: tar BASEIMAGE=$$arch ;\ ;; \ esac ;\ - sed -e "s/alpine:latest/$$BASEIMAGE\\/alpine:latest/" build/docker/linux/$$arch/Dockerfile.in > build/docker/linux/$$arch/Dockerfile ;\ + sed -e "s/alpine:latest/$$BASEIMAGE\\/alpine:latest/" -e "s/^\\s*RUN/#RUN/" build/docker/linux/$$arch/Dockerfile.in > build/docker/linux/$$arch/Dockerfile ;\ fi ;\ docker build -t podinfo build/docker/linux/$$arch ;\ docker tag podinfo $(DOCKER_IMAGE_NAME):podinfo-$$arch ;\