Skip to content

K
k3s
Commit 3cef590b authored by yankaiz's avatar yankaiz
Browse files
Options

Bump debian-iptables to v11.0.1

Rebase docker image on debian-base:0.4.1
parent 6c1e64b9
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
build/common.sh
View file @ 3cef590b
...@@ -89,8 +89,8 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 ...@@ -89,8 +89,8 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# $1 - server architecture # $1 - server architecture
kube::build::get_docker_wrapped_binaries() { kube::build::get_docker_wrapped_binaries() {
local arch=$1 local arch=$1
local debian_base_version=0.4.0 local debian_base_version=0.4.1
local debian_iptables_version=v11.0 local debian_iptables_version=v11.0.1
### If you change any of these lists, please also update DOCKERIZED_BINARIES ### If you change any of these lists, please also update DOCKERIZED_BINARIES
### in build/BUILD. And kube::golang::server_image_targets ### in build/BUILD. And kube::golang::server_image_targets
local targets=( local targets=(
......
build/debian-base/Makefile
View file @ 3cef590b
...@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io ...@@ -18,7 +18,7 @@ REGISTRY ?= staging-k8s.gcr.io
IMAGE ?= $(REGISTRY)/debian-base IMAGE ?= $(REGISTRY)/debian-base
BUILD_IMAGE ?= debian-build BUILD_IMAGE ?= debian-build
TAG ?= 0.4.0 TAG ?= 0.4.1
TAR_FILE ?= rootfs.tar TAR_FILE ?= rootfs.tar
ARCH?=amd64 ARCH?=amd64
......
build/debian-iptables/Makefile
View file @ 3cef590b
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
REGISTRY?="staging-k8s.gcr.io" REGISTRY?="staging-k8s.gcr.io"
IMAGE=$(REGISTRY)/debian-iptables IMAGE=$(REGISTRY)/debian-iptables
TAG?=v11.0 TAG?=v11.0.1
ARCH?=amd64 ARCH?=amd64
ALL_ARCH = amd64 arm arm64 ppc64le s390x ALL_ARCH = amd64 arm arm64 ppc64le s390x
TEMP_DIR:=$(shell mktemp -d) TEMP_DIR:=$(shell mktemp -d)
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.4.0 BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):0.4.1
# This option is for running docker manifest command # This option is for running docker manifest command
export DOCKER_CLI_EXPERIMENTAL := enabled export DOCKER_CLI_EXPERIMENTAL := enabled
......
build/root/WORKSPACE
View file @ 3cef590b
...@@ -70,18 +70,18 @@ http_file( ...@@ -70,18 +70,18 @@ http_file(
docker_pull( docker_pull(
name = "debian-base-amd64", name = "debian-base-amd64",
digest = "sha256:86176bc8ccdc4d8ea7fbf6ba4b57fcefc2cb61ff7413114630940474ff9bf751", digest = "sha256:8ccb65cd2dd7e0c24193d0742a20e4a673dbd11af5a33f16fcd471a31486866c",
registry = "k8s.gcr.io", registry = "k8s.gcr.io",
repository = "debian-base-amd64", repository = "debian-base-amd64",
tag = "0.4.0", # ignored, but kept here for documentation tag = "0.4.1", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(
name = "debian-iptables-amd64", name = "debian-iptables-amd64",
digest = "sha256:d4ff8136b9037694a3165a7fff6a91e7fc828741b8ea1eda226d4d9ea5d23abb", digest = "sha256:9c41b4c326304b94eb96fdd2e181aa6e9995cc4642fcdfb570cedd73a419ba39",
registry = "k8s.gcr.io", registry = "k8s.gcr.io",
repository = "debian-iptables-amd64", repository = "debian-iptables-amd64",
tag = "v11.0", # ignored, but kept here for documentation tag = "v11.0.1", # ignored, but kept here for documentation
) )
docker_pull( docker_pull(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment