mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Bump debian-base to buster
This commit is contained in:
parent
3b440dfd55
commit
573a99ea51
@ -94,8 +94,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=v1.0.0
|
local debian_base_version=v2.0.0
|
||||||
local debian_iptables_version=v11.0.2
|
local debian_iptables_version=v12.0.0
|
||||||
### 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=(
|
||||||
|
@ -41,28 +41,14 @@ RUN apt-mark hold apt gnupg adduser passwd libsemanage1 libcap2
|
|||||||
# Several utilities (e.g. ping) were kept for usefulness, but may be removed in later versions.
|
# Several utilities (e.g. ping) were kept for usefulness, but may be removed in later versions.
|
||||||
RUN echo "Yes, do as I say!" | apt-get purge \
|
RUN echo "Yes, do as I say!" | apt-get purge \
|
||||||
bash \
|
bash \
|
||||||
debconf-i18n \
|
|
||||||
e2fslibs \
|
|
||||||
e2fsprogs \
|
e2fsprogs \
|
||||||
init \
|
|
||||||
initscripts \
|
|
||||||
libcap2-bin \
|
libcap2-bin \
|
||||||
libkmod2 \
|
|
||||||
libmount1 \
|
libmount1 \
|
||||||
libsmartcols1 \
|
libsmartcols1 \
|
||||||
libudev1 \
|
|
||||||
libblkid1 \
|
libblkid1 \
|
||||||
libncursesw5 \
|
|
||||||
libprocps6 \
|
|
||||||
libslang2 \
|
|
||||||
libss2 \
|
libss2 \
|
||||||
libsystemd0 \
|
|
||||||
libtext-charwidth-perl libtext-iconv-perl libtext-wrapi18n-perl \
|
|
||||||
ncurses-base \
|
ncurses-base \
|
||||||
ncurses-bin \
|
ncurses-bin \
|
||||||
systemd \
|
|
||||||
systemd-sysv \
|
|
||||||
sysv-rc \
|
|
||||||
tzdata
|
tzdata
|
||||||
|
|
||||||
# No-op stubs replace some unnecessary binaries that may be depended on in the install process (in
|
# No-op stubs replace some unnecessary binaries that may be depended on in the install process (in
|
||||||
|
@ -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 ?= v1.0.0
|
TAG ?= v2.0.0
|
||||||
|
|
||||||
TAR_FILE ?= rootfs.tar
|
TAR_FILE ?= rootfs.tar
|
||||||
ARCH?=amd64
|
ARCH?=amd64
|
||||||
@ -33,22 +33,22 @@ SUDO=$(if $(filter 0,$(shell id -u)),,sudo)
|
|||||||
export DOCKER_CLI_EXPERIMENTAL := enabled
|
export DOCKER_CLI_EXPERIMENTAL := enabled
|
||||||
|
|
||||||
ifeq ($(ARCH),amd64)
|
ifeq ($(ARCH),amd64)
|
||||||
BASEIMAGE?=debian:stretch
|
BASEIMAGE?=debian:buster-slim
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),arm)
|
ifeq ($(ARCH),arm)
|
||||||
BASEIMAGE?=arm32v7/debian:stretch
|
BASEIMAGE?=arm32v7/debian:buster-slim
|
||||||
QEMUARCH=arm
|
QEMUARCH=arm
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),arm64)
|
ifeq ($(ARCH),arm64)
|
||||||
BASEIMAGE?=arm64v8/debian:stretch
|
BASEIMAGE?=arm64v8/debian:buster-slim
|
||||||
QEMUARCH=aarch64
|
QEMUARCH=aarch64
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),ppc64le)
|
ifeq ($(ARCH),ppc64le)
|
||||||
BASEIMAGE?=ppc64le/debian:stretch
|
BASEIMAGE?=ppc64le/debian:buster-slim
|
||||||
QEMUARCH=ppc64le
|
QEMUARCH=ppc64le
|
||||||
endif
|
endif
|
||||||
ifeq ($(ARCH),s390x)
|
ifeq ($(ARCH),s390x)
|
||||||
BASEIMAGE?=s390x/debian:stretch
|
BASEIMAGE?=s390x/debian:buster-slim
|
||||||
QEMUARCH=s390x
|
QEMUARCH=s390x
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -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.2
|
TAG?=v12.0.0
|
||||||
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):v1.0.0
|
BASEIMAGE?=k8s.gcr.io/debian-base-$(ARCH):v2.0.0
|
||||||
|
|
||||||
# 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
|
||||||
|
@ -113,7 +113,7 @@ def debian_image_dependencies():
|
|||||||
digest = _digest(_DEBIAN_BASE_DIGEST, arch),
|
digest = _digest(_DEBIAN_BASE_DIGEST, arch),
|
||||||
registry = "k8s.gcr.io",
|
registry = "k8s.gcr.io",
|
||||||
repository = "debian-base",
|
repository = "debian-base",
|
||||||
tag = "0.4.1", # ignored, but kept here for documentation
|
tag = "v2.0.0", # ignored, but kept here for documentation
|
||||||
)
|
)
|
||||||
|
|
||||||
container_pull(
|
container_pull(
|
||||||
@ -122,7 +122,7 @@ def debian_image_dependencies():
|
|||||||
digest = _digest(_DEBIAN_IPTABLES_DIGEST, arch),
|
digest = _digest(_DEBIAN_IPTABLES_DIGEST, arch),
|
||||||
registry = "k8s.gcr.io",
|
registry = "k8s.gcr.io",
|
||||||
repository = "debian-iptables",
|
repository = "debian-iptables",
|
||||||
tag = "v11.0.2", # ignored, but kept here for documentation
|
tag = "v12.0.0", # ignored, but kept here for documentation
|
||||||
)
|
)
|
||||||
|
|
||||||
container_pull(
|
container_pull(
|
||||||
|
Loading…
Reference in New Issue
Block a user