github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47375 from ixdy/debian-iptables-v8

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46678, 45545, 47375)

bazel: update debian-iptables-amd64 digest

**What this PR does / why we need it**: upstream debian has fixed several CVEs recently, so we should apply those fixes:
* CVE-2017-2616
* CVE-2017-6512

x-ref #47386

**Special notes for your reviewer**: nothing has been pushed yet, so this will likely fail many of the tests.

Do you think these version numbers make sense? We also need to fix debian-iptables v5, and I don't know what to do there. (v5.1?)

**Release note**:

```release-note
NONE
```
/assign @timstclair
This commit is contained in:
Kubernetes Submit Queue 2017-06-12 20:32:43 -07:00 committed by GitHub
commit 54f628ad79
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/debian-base/Makefile
View File

@ -18,7 +18,7 @@ REGISTRY ?= gcr.io/google-containers
IMAGE ?= debian-base IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build BUILD_IMAGE ?= debian-build
TAG ?= 0.1.0 TAG ?= 0.1
TAR_FILE ?= rootfs.tar TAR_FILE ?= rootfs.tar
ARCH?=amd64 ARCH?=amd64
@ -70,6 +70,9 @@ endif
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR) docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
rm -rf $(TEMP_DIR) rm -rf $(TEMP_DIR)
push: build
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)
clean: clean:
docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true
docker rmi -f $(BUILD_IMAGE) || true docker rmi -f $(BUILD_IMAGE) || true

2
build/root/WORKSPACE
View File

@ -62,7 +62,7 @@ http_file(
docker_pull( docker_pull(
name = "debian-iptables-amd64", name = "debian-iptables-amd64",
digest = "sha256:adde513f7b3561042cd2d2af4d2d355189bbb2f579584b5766e7d07be4f7e71e", # v7 digest = "sha256:bfc7cc030258f53495b5dacf1e1d750db9b8687577a8648a3c8e245f8d7d2c52", # v7
registry = "gcr.io", registry = "gcr.io",
repository = "google-containers/debian-iptables-amd64", repository = "google-containers/debian-iptables-amd64",
) )