From 410b388ad097d2e98334ad9fb9c65acc34d473ec Mon Sep 17 00:00:00 2001 From: Stephen Augustus Date: Fri, 1 May 2020 17:59:30 -0400 Subject: [PATCH] build: Fix base image versions on dependents Signed-off-by: Stephen Augustus --- build/debian-iptables/Makefile | 4 ++-- cluster/images/etcd-empty-dir-cleanup/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 17d4986fe79..1e7c4f5f93c 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -16,13 +16,13 @@ REGISTRY?="staging-k8s.gcr.io" IMAGE=$(REGISTRY)/debian-iptables -TAG?=v12.0.2 +TAG?=v12.0.1 ARCH?=amd64 ALL_ARCH = amd64 arm arm64 ppc64le s390x TEMP_DIR:=$(shell mktemp -d) BASE_REGISTRY?=k8s.gcr.io -BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.1 +BASEIMAGE?=$(BASE_REGISTRY)/debian-base-$(ARCH):v2.0.0 # This option is for running docker manifest command export DOCKER_CLI_EXPERIMENTAL := enabled diff --git a/cluster/images/etcd-empty-dir-cleanup/Dockerfile b/cluster/images/etcd-empty-dir-cleanup/Dockerfile index 7398f4e4642..0775a5e496f 100644 --- a/cluster/images/etcd-empty-dir-cleanup/Dockerfile +++ b/cluster/images/etcd-empty-dir-cleanup/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM k8s.gcr.io/debian-base:v1.0.0 +FROM k8s.gcr.io/debian-base:v2.0.0 COPY etcdctl etcd-empty-dir-cleanup.sh / RUN chmod a+rx /etcdctl /etcd-empty-dir-cleanup.sh