From 41cdd40a2eadf6a0cf7dac77dabf2b1475053a6e Mon Sep 17 00:00:00 2001 From: Claudiu Belu Date: Fri, 5 Feb 2021 10:07:26 +0000 Subject: [PATCH] images: Removes containers after they've run Not all instances of docker run has the --rm argument, which means that they'll persist after they've finished. This can cause storage to remain occupied needlessly. --- build/pause/Makefile | 2 +- cluster/images/etcd-version-monitor/Makefile | 2 +- cluster/images/etcd/Makefile | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/pause/Makefile b/build/pause/Makefile index 1735a09c9c7..c7b516f4b06 100644 --- a/build/pause/Makefile +++ b/build/pause/Makefile @@ -141,7 +141,7 @@ container: .container-${OS}-$(ARCH) orphan: bin/orphan-linux-$(ARCH) bin/orphan-linux-$(ARCH): linux/orphan.c mkdir -p bin - docker run -u $$(id -u):$$(id -g) -v $$(pwd):/build \ + docker run --rm -u $$(id -u):$$(id -g) -v $$(pwd):/build \ $(KUBE_CROSS_IMAGE):$(KUBE_CROSS_VERSION) \ /bin/bash -c "\ cd /build && \ diff --git a/cluster/images/etcd-version-monitor/Makefile b/cluster/images/etcd-version-monitor/Makefile index 88429b31896..37ebbbbc8d4 100644 --- a/cluster/images/etcd-version-monitor/Makefile +++ b/cluster/images/etcd-version-monitor/Makefile @@ -30,7 +30,7 @@ build: cp etcd-version-monitor.go Dockerfile $(TEMP_DIR) # Compile etcd-version-monitor. - docker run -it \ + docker run --rm -it \ -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes \ -v $(TEMP_DIR):/build \ -e GOARCH=$(ARCH) \ diff --git a/cluster/images/etcd/Makefile b/cluster/images/etcd/Makefile index 49803a3ee0b..3bd96cf4729 100644 --- a/cluster/images/etcd/Makefile +++ b/cluster/images/etcd/Makefile @@ -91,10 +91,10 @@ build: # Compile migrate migrate_tmp_dir=$(shell mktemp -d); \ - docker run --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ + docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ /bin/bash -c "CGO_ENABLED=0 go build -o /build/migrate k8s.io/kubernetes/cluster/images/etcd/migrate"; \ $(BIN_INSTALL) $${migrate_tmp_dir}/migrate $(TEMP_DIR); \ - docker run --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ + docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -v $${migrate_tmp_dir}:/build$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ /bin/bash -c "CGO_ENABLED=0 go build -o /build/cp k8s.io/kubernetes/cluster/images/etcd/cp"; \ $(BIN_INSTALL) $${migrate_tmp_dir}/cp $(TEMP_DIR); @@ -125,7 +125,7 @@ else if [ $$(echo $$version | cut -d. -f2) -gt 3 ]; then \ etcd_build_dir="/go/src/go.etcd.io/etcd"; \ fi; \ - docker run --interactive -v $${etcd_release_tmp_dir}:/etcdbin golang:$(GOLANG_VERSION)$(DOCKER_VOL_OPTS) /bin/bash -c \ + docker run --rm --interactive -v $${etcd_release_tmp_dir}:/etcdbin golang:$(GOLANG_VERSION)$(DOCKER_VOL_OPTS) /bin/bash -c \ "git clone https://github.com/coreos/etcd $$etcd_build_dir \ && cd $$etcd_build_dir \ && git checkout v$${version} \ @@ -172,7 +172,7 @@ push-manifest: docker manifest push --purge ${MANIFEST_IMAGE}:${IMAGE_TAG} unit-test: - docker run --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ + docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) golang:$(GOLANG_VERSION) \ /bin/bash -c "CGO_ENABLED=0 go test -v k8s.io/kubernetes/cluster/images/etcd/migrate" # Integration tests require both a golang build environment and all the etcd binaries from a `k8s.gcr.io/etcd` image (`/usr/local/bin/etcd-`, ...). @@ -185,7 +185,7 @@ build-integration-test-image: build docker build --pull -t etcd-integration-test $(TEMP_DIR)_integration_test integration-test: - docker run --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) etcd-integration-test \ + docker run --rm --interactive -v $(shell pwd)/../../../:/go/src/k8s.io/kubernetes$(DOCKER_VOL_OPTS) -e GOARCH=$(ARCH) etcd-integration-test \ /bin/bash -c "CGO_ENABLED=0 go test -tags=integration k8s.io/kubernetes/cluster/images/etcd/migrate -args -v 10 -logtostderr true" integration-build-test: build-integration-test-image integration-test