From 1e295a48e708454cf7d6b7d2b7c3818701f0b33a Mon Sep 17 00:00:00 2001 From: Matt Robinson Date: Tue, 21 Apr 2020 10:48:40 -0400 Subject: [PATCH] add container image for segment-reaper (#3855) --- Makefile | 20 ++++++++++++++++++-- cmd/segment-reaper/Dockerfile | 9 +++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 cmd/segment-reaper/Dockerfile diff --git a/Makefile b/Makefile index e58a10e37..42f16d9c3 100644 --- a/Makefile +++ b/Makefile @@ -154,7 +154,7 @@ storagenode-console: gofmt -w -s storagenode/console/consoleassets/bindata.resource.go .PHONY: images -images: satellite-image storagenode-image uplink-image versioncontrol-image ## Build satellite, storagenode, uplink, and versioncontrol Docker images +images: satellite-image segment-reaper storagenode-image uplink-image versioncontrol-image ## Build satellite, segment-reaper, storagenode, uplink, and versioncontrol Docker images echo Built version: ${TAG} .PHONY: satellite-image @@ -167,6 +167,18 @@ satellite-image: satellite_linux_arm satellite_linux_arm64 satellite_linux_amd64 ${DOCKER_BUILD} --pull=true -t storjlabs/satellite:${TAG}${CUSTOMTAG}-aarch64 \ --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=aarch64 \ -f cmd/satellite/Dockerfile . + +.PHONY: segment-reaper-image +segment-reaper-image: segment-reaper_linux_amd64 segment-reaper_linux_arm segment-reaper_linux_arm64 ## Build segment-reaper Docker image + ${DOCKER_BUILD} --pull=true -t storjlabs/segment-reaper:${TAG}${CUSTOMTAG}-amd64 \ + -f cmd/segment-reaper/Dockerfile . + ${DOCKER_BUILD} --pull=true -t storjlabs/segment-reaper:${TAG}${CUSTOMTAG}-arm32v6 \ + --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=arm32v6 \ + -f cmd/segment-reaper/Dockerfile . + ${DOCKER_BUILD} --pull=true -t storjlabs/segment-reaper:${TAG}${CUSTOMTAG}-aarch64 \ + --build-arg=GOARCH=arm --build-arg=DOCKER_ARCH=aarch64 \ + -f cmd/segment-reaper/Dockerfile . + .PHONY: storagenode-image storagenode-image: storagenode_linux_arm storagenode_linux_arm64 storagenode_linux_amd64 ## Build storagenode Docker image ${DOCKER_BUILD} --pull=true -t storjlabs/storagenode:${TAG}${CUSTOMTAG}-amd64 \ @@ -251,6 +263,9 @@ inspector_%: .PHONY: satellite_% satellite_%: $(MAKE) binary-check COMPONENT=satellite GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) +.PHONY: segment-reaper_% +segment-reaper_%: + $(MAKE) binary-check COMPONENT=segment-reaper GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) .PHONY: storagenode_% storagenode_%: storagenode-console $(MAKE) binary-check COMPONENT=storagenode GOARCH=$(word 3, $(subst _, ,$@)) GOOS=$(word 2, $(subst _, ,$@)) @@ -290,7 +305,7 @@ libuplink-gomobile: push-images: ## Push Docker images to Docker Hub (jenkins) # images have to be pushed before a manifest can be created # satellite - for c in satellite storagenode uplink versioncontrol ; do \ + for c in satellite segment-reaper storagenode uplink versioncontrol ; do \ docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-amd64 \ && docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-arm32v6 \ && docker push storjlabs/$$c:${TAG}${CUSTOMTAG}-aarch64 \ @@ -337,6 +352,7 @@ clean-images: -docker rmi storjlabs/storagenode:${TAG}${CUSTOMTAG} -docker rmi storjlabs/uplink:${TAG}${CUSTOMTAG} -docker rmi storjlabs/versioncontrol:${TAG}${CUSTOMTAG} + -docker rmi storjlabs/segment-reaper:${TAG}${CUSTOMTAG} .PHONY: test-docker-clean test-docker-clean: ## Clean up Docker environment used in test-docker target diff --git a/cmd/segment-reaper/Dockerfile b/cmd/segment-reaper/Dockerfile new file mode 100644 index 000000000..91703330e --- /dev/null +++ b/cmd/segment-reaper/Dockerfile @@ -0,0 +1,9 @@ +ARG DOCKER_ARCH +FROM ${DOCKER_ARCH:-amd64}/alpine +ARG TAG +ARG GOARCH +ENV GOARCH ${GOARCH} + +WORKDIR /app +COPY release/${TAG}/segment-reaper_linux_${GOARCH:-amd64} /app/segment-reaper +ENTRYPOINT ["/app/segment-reaper"]