diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 5e2b15bd..45a92182 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -1,4 +1,4 @@ -FROM registry.suse.com/bci/golang:1.20 +FROM registry.suse.com/bci/golang:1.22 ARG DAPPER_HOST_ARCH ENV HOST_ARCH=${DAPPER_HOST_ARCH} ARCH=${DAPPER_HOST_ARCH} @@ -8,7 +8,7 @@ RUN zypper -n install gcc vim less file docker git wget curl go ENV GOLANG_ARCH_amd64=amd64 GOLANG_ARCH_arm=armv6l GOLANG_ARCH_arm64=arm64 GOLANG_ARCH=GOLANG_ARCH_${ARCH} \ GOPATH=/go PATH=/go/bin:/usr/local/go/bin:${PATH} SHELL=/bin/bash -ENV GOLANGCI_LINT=v1.53.3 +ENV GOLANGCI_LINT=v1.59.0 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s ${GOLANGCI_LINT}; ENV DAPPER_ENV REPO TAG DRONE_TAG diff --git a/package/Dockerfile b/package/Dockerfile index b87c6efe..1a0f5f42 100644 --- a/package/Dockerfile +++ b/package/Dockerfile @@ -1,12 +1,12 @@ FROM nginx:1.24.0-alpine as base -ENV DOCKER_VERSION=20.10.24 +ENV DOCKER_VERSION=25.0.5 ENV CNI_PLUGINS_VERSION=v1.2.0 ENV FLANNEL_VERSION=v1.2.0 -ENV ETCD_VERSION=v3.5.6 -ENV CRIDOCKERD_VERSION=0.3.11 +ENV ETCD_VERSION=v3.5.10 +ENV CRIDOCKERD_VERSION=0.3.14 ENV RANCHER_CONFD_VERSION=v0.16.5 -ENV KUBECTL_VERSION=v1.24.15 +ENV KUBECTL_VERSION=v1.28.10 LABEL maintainer "Rancher Labs " ARG ARCH=amd64