From ce3a405644665629f99d17b99296a2ddb95b238b Mon Sep 17 00:00:00 2001 From: Jeff Wendling Date: Thu, 17 Feb 2022 16:01:09 -0500 Subject: [PATCH] makefile: remove uplink-image Change-Id: I3552de12fa99892bcd7e83aa5b0fdddb268f7db5 --- Makefile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/Makefile b/Makefile index d83f1bbfb..f930bd123 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,7 @@ satellite-wasm: scripts/build-wasm.sh ;\ .PHONY: images -images: satellite-image storagenode-image uplink-image versioncontrol-image ## Build satellite, storagenode, uplink, and versioncontrol Docker images +images: satellite-image storagenode-image versioncontrol-image ## Build satellite, storagenode, and versioncontrol Docker images echo Built version: ${TAG} .PHONY: satellite-image @@ -223,16 +223,6 @@ storagenode-image: ## Build storagenode Docker image --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm64v8 --build-arg=APK_ARCH=aarch64 \ -f cmd/storagenode/Dockerfile . -.PHONY: uplink-image -uplink-image: uplink_linux_arm uplink_linux_arm64 uplink_linux_amd64 ## Build uplink Docker image - ${DOCKER_BUILD} --pull=true -t storjlabs/uplink:${TAG}${CUSTOMTAG}-amd64 \ - -f cmd/uplink/Dockerfile . - ${DOCKER_BUILD} --pull=true -t storjlabs/uplink:${TAG}${CUSTOMTAG}-arm32v6 \ - --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ - -f cmd/uplink/Dockerfile . - ${DOCKER_BUILD} --pull=true -t storjlabs/uplink:${TAG}${CUSTOMTAG}-arm64v8 \ - --build-arg=GOARCH=arm64 --build-arg=DOCKER_ARCH=arm64v8 \ - -f cmd/uplink/Dockerfile . .PHONY: versioncontrol-image versioncontrol-image: versioncontrol_linux_arm versioncontrol_linux_arm64 versioncontrol_linux_amd64 ## Build versioncontrol Docker image ${DOCKER_BUILD} --pull=true -t storjlabs/versioncontrol:${TAG}${CUSTOMTAG}-amd64 \ @@ -385,7 +375,6 @@ binaries-clean: ## Remove all local release binaries (jenkins) clean-images: -docker rmi storjlabs/satellite:${TAG}${CUSTOMTAG} -docker rmi storjlabs/storagenode:${TAG}${CUSTOMTAG} - -docker rmi storjlabs/uplink:${TAG}${CUSTOMTAG} -docker rmi storjlabs/versioncontrol:${TAG}${CUSTOMTAG} ##@ Tooling