diff --git a/Dockerfile b/Dockerfile index bfc051e168..658758d05e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.22.8b1 AS build +FROM rancher/hardened-build-base:v1.22.9b1 AS build ARG DAPPER_HOST_ARCH ENV ARCH $DAPPER_HOST_ARCH RUN set -x && \ @@ -117,7 +117,7 @@ RUN rm -vf /charts/*.sh /charts/*.md /charts/chart_versions.yaml # This image includes any host level programs that we might need. All binaries # must be placed in bin/ of the file image and subdirectories of bin/ will be flattened during installation. # This means bin/foo/bar will become bin/bar when rke2 installs this to the host -FROM rancher/hardened-kubernetes:v1.29.11-rke2r1-build20241202 AS kubernetes +FROM rancher/hardened-kubernetes:v1.29.12-rke2r1-build20241212 AS kubernetes FROM rancher/hardened-containerd:v1.7.23-k3s2-build20241203 AS containerd FROM rancher/hardened-crictl:v1.29.0-build20241008 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index fdf4fed2b4..ba62a1c90d 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -32,8 +32,8 @@ REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; PLATFORM=${GOOS}-${GOARCH} RELEASE=${PROG}.${PLATFORM} # hardcode versions unless set specifically -KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.11} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.11-rke2r1-build20241202} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.29.12} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.29.12-rke2r1-build20241212} ETCD_VERSION=${ETCD_VERSION:-v3.5.16-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.29.10-0.20241016053521-9510ac25fefb-build20241016}