Skip to content
Merged
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions images/calico-go-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ARG TARGETARCH

ARG CONTAINERREGISTRY_VERSION=v0.20.7
ARG CONTROLLER_TOOLS_VERSION=v0.18.0
ARG GINKGO_VERSION=v2.28.1
ARG GO_LINT_VERSION=v2.8.0
ARG MOCKERY_VERSION=3.5.5
ARG PROTOC_VERSION=33.4
Expand Down Expand Up @@ -193,12 +194,10 @@ RUN set -eux; \
esac

# Install go programs that we rely on
# Install ginkgo v2 as ginkgo2 and keep ginkgo v1 as ginkgo
RUN set -eux; \
k8s_libs_version=$(yq -r .kubernetes.version /etc/versions.yaml | sed 's/^1/0/'); \
go install github.com/onsi/ginkgo/v2/ginkgo@v2.27.5 && mv /go/bin/ginkgo /go/bin/ginkgo2 && \
go install github.com/onsi/ginkgo/ginkgo@v1.16.5 && \
go install github.com/jstemmer/go-junit-report@v1.0.0 && \
go install github.com/onsi/ginkgo/v2/ginkgo@${GINKGO_VERSION} && \
go install github.com/wadey/gocovmerge@v0.0.0-20160331181800-b5bfa59ec0ad && \
go install golang.org/x/tools/cmd/goimports@v0.41.0 && \
go install golang.org/x/tools/cmd/stringer@v0.41.0 && \
Expand Down