Skip to content

Commit

Permalink
bump library version for golang 1.18 (#440)
Browse files Browse the repository at this point in the history
  • Loading branch information
horis233 authored Apr 14, 2022
1 parent 3bfab8c commit 4b40fdb
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions prow/docker/build-tool/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ ARG ARCH=amd64
# Pinned versions of stuff
ENV CONTROLLER_GEN_VERSION=v0.4.0
ENV GOIMPORTS_VERSION=379209517ffe
ENV GOLANGCI_LINT_VERSION=v1.23.1
ENV GOLANGCI_LINT_VERSION=v1.44.0
ENV HELM_VERSION=v3.4.1
ENV KUBECTL_VERSION=v1.16.0
ENV KUBEBUILDER_VERSION=2.3.1
ENV KUSTOMIZE_VERSION=v4.0.5
ENV KUSTOMIZE_VERSION=v4.5.4
ENV OPERATOR_SDK_VERSION=v1.3.0
ENV KIND_VERSION=v0.10.0

Expand All @@ -40,11 +40,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
software-properties-common

# Build and install Go tools
RUN go get -ldflags="-s -w" sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION}
RUN go get -ldflags="-s -w" golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION}
RUN go get -ldflags="-s -w" github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
RUN go get -ldflags="-s -w" sigs.k8s.io/kustomize/kustomize/v4@${KUSTOMIZE_VERSION}
RUN go get -ldflags="-s -w" sigs.k8s.io/kind@${KIND_VERSION}
RUN go install -ldflags="-s -w" sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION}
RUN go install -ldflags="-s -w" golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION}
RUN go install -ldflags="-s -w" github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
RUN go install -ldflags="-s -w" sigs.k8s.io/kustomize/kustomize/v4@${KUSTOMIZE_VERSION}
RUN go install -ldflags="-s -w" sigs.k8s.io/kind@${KIND_VERSION}

# operator-sdk
RUN OPERATOR_SDK_ARCH=$(echo ${ARCH}| sed 's/amd64/x86_64/g'); \
Expand Down
6 changes: 3 additions & 3 deletions prow/docker/check-tool/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ FROM golang:1.18.1 as binary_tools_context

# Pinned versions of stuff
ENV GOIMPORTS_VERSION=379209517ffe
ENV GOLANGCI_LINT_VERSION=v1.23.1
ENV GOLANGCI_LINT_VERSION=v1.44.0
ENV HADOLINT_VERSION=v1.17.2
ENV HELM_VERSION=v3.4.1
ENV KUBECTL_VERSION=v1.16.0
Expand Down Expand Up @@ -35,8 +35,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
xz-utils

# Build and install a bunch of Go tools
RUN go get -ldflags="-s -w" golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION}
RUN go get -ldflags="-s -w" github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}
RUN go install -ldflags="-s -w" golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION}
RUN go install -ldflags="-s -w" github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_LINT_VERSION}

# Hadolint linter
ADD https://github.com/hadolint/hadolint/releases/download/${HADOLINT_VERSION}/hadolint-Linux-x86_64 ${OUTDIR}/usr/bin/hadolint
Expand Down

0 comments on commit 4b40fdb

Please sign in to comment.