From 66d21d702279158c19f4da9741e36c52fc0b0101 Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Tue, 31 Jan 2023 06:59:38 +0000 Subject: [PATCH] Add ginkgo v2 to operator build base --- Dockerfile.gitlab-operator-build-base-golang-1.18 | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile.gitlab-operator-build-base-golang-1.18 b/Dockerfile.gitlab-operator-build-base-golang-1.18 index d51a100..9d8fb30 100644 --- a/Dockerfile.gitlab-operator-build-base-golang-1.18 +++ b/Dockerfile.gitlab-operator-build-base-golang-1.18 @@ -57,8 +57,12 @@ RUN apk add --no-cache podman buildah curl make gcc musl-dev git bash coreutils # accomodate running podman within docker RUN sed -i 's#^driver.*$#driver = "vfs"#g' /etc/containers/storage.conf -ARG GINKGO_VERSION=1.16.5 -RUN go install github.com/onsi/ginkgo/ginkgo@v${GINKGO_VERSION} +ARG GINKGO_V1_VERSION=1.16.5 +ARG GINKGO_V2_VERSION=2.7.1 +RUN go install github.com/onsi/ginkgo/v2/ginkgo@v${GINKGO_V2_VERSION} \ + && mv $(go env GOPATH)/bin/ginkgo $(go env GOPATH)/bin/ginkgo2 \ + && go install github.com/onsi/ginkgo/ginkgo@v${GINKGO_V1_VERSION} + RUN go install golang.org/x/lint/golint@latest # Kubebuilder