Skip to content

Commit

Permalink
Bump debian-iptables to v11.0.1. Rebase docker image on debian-base:0…
Browse files Browse the repository at this point in the history
….4.1
  • Loading branch information
grayluck committed Mar 7, 2019
1 parent 9a063aa commit b5f9d59
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion build/common.sh
Expand Up @@ -88,7 +88,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
#
# $1 - server architecture
kube::build::get_docker_wrapped_binaries() {
debian_iptables_version=v10.2
debian_iptables_version=v11.0.1
### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets
case $1 in
Expand Down
2 changes: 1 addition & 1 deletion build/debian-base/Makefile
Expand Up @@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE ?= $(REGISTRY)/debian-base
BUILD_IMAGE ?= debian-build

TAG ?= 0.3.2
TAG ?= 0.4.1

TAR_FILE ?= rootfs.tar
ARCH?=amd64
Expand Down
4 changes: 2 additions & 2 deletions build/debian-iptables/Makefile
Expand Up @@ -16,12 +16,12 @@

REGISTRY?="staging-k8s.gcr.io"
IMAGE=$(REGISTRY)/debian-iptables
TAG?=v10.2
TAG?=v11.0.1
ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d)

BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.3.2
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.4.1

# This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled
Expand Down
4 changes: 2 additions & 2 deletions build/root/WORKSPACE
Expand Up @@ -70,10 +70,10 @@ http_file(

docker_pull(
name = "debian-iptables-amd64",
digest = "sha256:0987db7ce42949d20ed2647a65d4bee0b616b4d40c7ea54769cc24b7ad003677",
digest = "sha256:9c41b4c326304b94eb96fdd2e181aa6e9995cc4642fcdfb570cedd73a419ba39",
registry = "k8s.gcr.io",
repository = "debian-iptables-amd64",
tag = "v10.2", # ignored, but kept here for documentation
tag = "v11.0.1", # ignored, but kept here for documentation
)

docker_pull(
Expand Down

0 comments on commit b5f9d59

Please sign in to comment.