mirror of https://github.com/k3s-io/k3s
Merge pull request #73493 from tallclair/debian-base
Bump debian-* base images for security fixespull/564/head
commit
cc45621baf
|
@ -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
|
||||||
|
|
|
@ -19,12 +19,12 @@
|
||||||
|
|
||||||
REGISTRY?=staging-k8s.gcr.io
|
REGISTRY?=staging-k8s.gcr.io
|
||||||
IMAGE?=$(REGISTRY)/debian-hyperkube-base
|
IMAGE?=$(REGISTRY)/debian-hyperkube-base
|
||||||
TAG=0.12.0
|
TAG=0.12.1
|
||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
ALL_ARCH = amd64 arm arm64 ppc64le s390x
|
ALL_ARCH = amd64 arm arm64 ppc64le s390x
|
||||||
CACHEBUST?=1
|
CACHEBUST?=1
|
||||||
|
|
||||||
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.0
|
BASEIMAGE=k8s.gcr.io/debian-base-$(ARCH):0.4.1
|
||||||
CNI_VERSION=v0.6.0
|
CNI_VERSION=v0.6.0
|
||||||
|
|
||||||
TEMP_DIR:=$(shell mktemp -d)
|
TEMP_DIR:=$(shell mktemp -d)
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue