From cafbcbd2cbcaf9b0f41c4ade6280ac7213a6ef25 Mon Sep 17 00:00:00 2001 From: Waleed Malik Date: Thu, 29 Jul 2021 14:56:43 +0500 Subject: [PATCH] Update build image targetC --- Makefile | 32 ++++---------------------------- 1 file changed, 4 insertions(+), 28 deletions(-) diff --git a/Makefile b/Makefile index e24c9e58e..d07db2b6a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ # note: call scripts from /scripts -.PHONY: default build builder-image binary-image test stop clean-images clean push apply deploy release release-all manifest push clean-image +.PHONY: default build build-image test stop push apply deploy release release-all manifest push OS ?= linux ARCH ?= ??? @@ -29,20 +29,13 @@ install: build: "$(GOCMD)" build ${GOFLAGS} ${LDFLAGS} -o "${BINARY}" -builder-image: - docker buildx build --platform ${OS}/${ARCH} --build-arg GOARCH=$(ARCH) -t "${BUILDER}" --load -f build/package/Dockerfile.build . - -reloader-${ARCH}.tar: - docker buildx build --platform ${OS}/${ARCH} --build-arg GOARCH=$(ARCH) -t "${BUILDER}" --load -f build/package/Dockerfile.build . - docker run --platform ${OS}/${ARCH} --rm "${BUILDER}" > reloader-${ARCH}.tar - -binary-image: builder-image - cat reloader-${ARCH}.tar | docker buildx build --platform ${OS}/${ARCH} -t "${REPOSITORY_ARCH}" --load -f Dockerfile.run - +build-image: + docker buildx build --platform ${OS}/${ARCH} --build-arg GOARCH=$(ARCH) -t "${REPOSITORY_ARCH}" --load -f Dockerfile . push: docker push ${REPOSITORY_ARCH} -release: binary-image push manifest +release: build-image push manifest release-all: -rm -rf ~/.docker/manifests/* @@ -66,23 +59,6 @@ test: stop: @docker stop "${BINARY}" -clean-images: stop - -docker rmi "${BINARY}" - @for arch in $(ALL_ARCH) ; do \ - echo Clean image: $$arch ; \ - make clean-image ARCH=$$arch ; \ - done - -docker rmi "${REPOSITORY_GENERIC}" - -clean-image: - -docker rmi "${BUILDER}" - -docker rmi "${REPOSITORY_ARCH}" - -rm -rf ~/.docker/manifests/* - -clean: - "$(GOCMD)" clean -i - -rm -rf reloader-*.tar - apply: kubectl apply -f deployments/manifests/ -n temp-reloader