Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated cri dockerd, docker and etcd dependencies #183

Merged
merged 2 commits into from
Jun 6, 2024
Merged

updated cri dockerd, docker and etcd dependencies #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde61d6
bumped docker,etcd,kubectl and cridockerd
vardhaman22 May 30, 2024
4fe0c49
updated golang image to 1.22 and golangci lint to v1.59.0
vardhaman22 May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile.dapper
View file
Open in desktop
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
View file
Open in desktop
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