diff --git a/Dockerfile b/Dockerfile index 90799d247a..bb8c508678 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG KUBERNETES_VERSION=dev # Build environment -FROM rancher/hardened-build-base:v1.22.6b1 AS build +FROM rancher/hardened-build-base:v1.22.8b1 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.30.5-rke2r1-build20240912 AS kubernetes +FROM rancher/hardened-kubernetes:v1.30.6-rke2r1-build20241023 AS kubernetes FROM rancher/hardened-containerd:v1.7.22-k3s1-build20241010 AS containerd FROM rancher/hardened-crictl:v1.30.1-build20240910 AS crictl FROM rancher/hardened-runc:v1.1.14-build20240910 AS runc diff --git a/scripts/version.sh b/scripts/version.sh index 9a58d481f6..a39b272970 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.30.5} -KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.5-rke2r1-build20240912} +KUBERNETES_VERSION=${KUBERNETES_VERSION:-v1.30.6} +KUBERNETES_IMAGE_TAG=${KUBERNETES_IMAGE_TAG:-v1.30.6-rke2r1-build20241023} ETCD_VERSION=${ETCD_VERSION:-v3.5.13-k3s1} PAUSE_VERSION=${PAUSE_VERSION:-3.6} CCM_VERSION=${CCM_VERSION:-v1.30.6-0.20241016053533-5ec454f50e7a-build20241016}