Skip to content

Commit

Permalink
Merge pull request #183 from vardhaman22/k8s-1.30
Browse files Browse the repository at this point in the history
updated cri dockerd, docker and etcd dependencies
  • Loading branch information
vardhaman22 authored Jun 6, 2024
2 parents fd2af49 + 4fe0c49 commit bbaa204
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.dapper
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -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
Expand Down
8 changes: 4 additions & 4 deletions package/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>"
ARG ARCH=amd64
Expand Down

0 comments on commit bbaa204

Please sign in to comment.