Skip to content

Commit

Permalink
Merge pull request kubernetes#47375 from ixdy/debian-iptables-v8
Browse files Browse the repository at this point in the history
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 kubernetes#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
  • Loading branch information
Kubernetes Submit Queue authored Jun 13, 2017
2 parents 456293b + 901fba4 commit 54f628a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion build/debian-base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ REGISTRY ?= gcr.io/google-containers
IMAGE ?= debian-base
BUILD_IMAGE ?= debian-build

TAG ?= 0.1.0
TAG ?= 0.1

TAR_FILE ?= rootfs.tar
ARCH?=amd64
Expand Down Expand Up @@ -70,6 +70,9 @@ endif
docker build -t $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) $(TEMP_DIR)
rm -rf $(TEMP_DIR)

push: build
gcloud docker -- push $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG)

clean:
docker rmi -f $(REGISTRY)/$(IMAGE)-$(ARCH):$(TAG) || true
docker rmi -f $(BUILD_IMAGE) || true
Expand Down
2 changes: 1 addition & 1 deletion build/root/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ http_file(

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

0 comments on commit 54f628a

Please sign in to comment.