From df788bd66a5d20ebb1e508db40d5c988d4ac7bc1 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 10 Aug 2018 11:04:53 -0700 Subject: [PATCH 1/2] Add missing tmpdir path to chmod --- build/debian-base/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/debian-base/Makefile b/build/debian-base/Makefile index ef39666460a..3f9cd4b29b2 100755 --- a/build/debian-base/Makefile +++ b/build/debian-base/Makefile @@ -61,7 +61,7 @@ else docker run --rm --privileged multiarch/qemu-user-static:register --reset curl -sSL https://github.com/multiarch/qemu-user-static/releases/download/$(QEMUVERSION)/x86_64_qemu-$(QEMUARCH)-static.tar.gz | tar -xz -C $(TEMP_DIR) # Ensure we don't get surprised by umask settings - chmod 0755 qemu-$(QEMUARCH)-static + chmod 0755 $(TEMP_DIR)/qemu-$(QEMUARCH)-static sed "s/CROSS_BUILD_//g" $(TEMP_DIR)/Dockerfile.build > $(TEMP_DIR)/Dockerfile.build.tmp endif mv $(TEMP_DIR)/Dockerfile.build.tmp $(TEMP_DIR)/Dockerfile.build From 296fe185faaaa9f31673ce0461b95e7fd5254e49 Mon Sep 17 00:00:00 2001 From: Jeff Grafton Date: Fri, 10 Aug 2018 15:37:10 -0700 Subject: [PATCH 2/2] Update to use debian-base:0.3.2 --- build/debian-hyperkube-base/Makefile | 2 +- build/debian-iptables/Makefile | 2 +- test/images/pets/peer-finder/BASEIMAGE | 8 ++++---- test/images/pets/redis-installer/BASEIMAGE | 8 ++++---- test/images/pets/zookeeper-installer/BASEIMAGE | 8 ++++---- test/images/resource-consumer/BASEIMAGE | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/debian-hyperkube-base/Makefile b/build/debian-hyperkube-base/Makefile index 30b12386a3e..f6440885562 100644 --- a/build/debian-hyperkube-base/Makefile +++ b/build/debian-hyperkube-base/Makefile @@ -23,7 +23,7 @@ TAG=0.10.1 ARCH?=amd64 CACHEBUST?=1 -BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1 +BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 CNI_VERSION=v0.6.0 TEMP_DIR:=$(shell mktemp -d) diff --git a/build/debian-iptables/Makefile b/build/debian-iptables/Makefile index 8cd9ccb4d4c..fa7781c7e3b 100644 --- a/build/debian-iptables/Makefile +++ b/build/debian-iptables/Makefile @@ -20,7 +20,7 @@ TAG=v10.1 ARCH?=amd64 TEMP_DIR:=$(shell mktemp -d) -BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.1 +BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.3.2 build: cp ./* $(TEMP_DIR) diff --git a/test/images/pets/peer-finder/BASEIMAGE b/test/images/pets/peer-finder/BASEIMAGE index abfbcb42726..67f1b591b38 100644 --- a/test/images/pets/peer-finder/BASEIMAGE +++ b/test/images/pets/peer-finder/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.1 -arm=k8s.gcr.io/debian-base-arm:0.3.1 -arm64=k8s.gcr.io/debian-base-arm64:0.3.1 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 +amd64=k8s.gcr.io/debian-base-amd64:0.3.2 +arm=k8s.gcr.io/debian-base-arm:0.3.2 +arm64=k8s.gcr.io/debian-base-arm64:0.3.2 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 diff --git a/test/images/pets/redis-installer/BASEIMAGE b/test/images/pets/redis-installer/BASEIMAGE index abfbcb42726..67f1b591b38 100644 --- a/test/images/pets/redis-installer/BASEIMAGE +++ b/test/images/pets/redis-installer/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.1 -arm=k8s.gcr.io/debian-base-arm:0.3.1 -arm64=k8s.gcr.io/debian-base-arm64:0.3.1 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 +amd64=k8s.gcr.io/debian-base-amd64:0.3.2 +arm=k8s.gcr.io/debian-base-arm:0.3.2 +arm64=k8s.gcr.io/debian-base-arm64:0.3.2 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 diff --git a/test/images/pets/zookeeper-installer/BASEIMAGE b/test/images/pets/zookeeper-installer/BASEIMAGE index abfbcb42726..67f1b591b38 100644 --- a/test/images/pets/zookeeper-installer/BASEIMAGE +++ b/test/images/pets/zookeeper-installer/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.1 -arm=k8s.gcr.io/debian-base-arm:0.3.1 -arm64=k8s.gcr.io/debian-base-arm64:0.3.1 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 +amd64=k8s.gcr.io/debian-base-amd64:0.3.2 +arm=k8s.gcr.io/debian-base-arm:0.3.2 +arm64=k8s.gcr.io/debian-base-arm64:0.3.2 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2 diff --git a/test/images/resource-consumer/BASEIMAGE b/test/images/resource-consumer/BASEIMAGE index abfbcb42726..67f1b591b38 100644 --- a/test/images/resource-consumer/BASEIMAGE +++ b/test/images/resource-consumer/BASEIMAGE @@ -1,4 +1,4 @@ -amd64=k8s.gcr.io/debian-base-amd64:0.3.1 -arm=k8s.gcr.io/debian-base-arm:0.3.1 -arm64=k8s.gcr.io/debian-base-arm64:0.3.1 -ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.1 +amd64=k8s.gcr.io/debian-base-amd64:0.3.2 +arm=k8s.gcr.io/debian-base-arm:0.3.2 +arm64=k8s.gcr.io/debian-base-arm64:0.3.2 +ppc64le=k8s.gcr.io/debian-base-ppc64le:0.3.2