From 21989210b09440c1ddc5b287eed358027289e4db Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Tue, 7 Feb 2023 14:56:34 +0100 Subject: [PATCH] Remove ginkgo v1 from operator build base --- Dockerfile.gitlab-operator-build-base-golang-1.18 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile.gitlab-operator-build-base-golang-1.18 b/Dockerfile.gitlab-operator-build-base-golang-1.18 index 9d8fb30..0abc254 100644 --- a/Dockerfile.gitlab-operator-build-base-golang-1.18 +++ b/Dockerfile.gitlab-operator-build-base-golang-1.18 @@ -57,11 +57,9 @@ 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_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} + && ln -s "${GOPATH}/bin/ginkgo" "${GOPATH}/bin/ginkgo2" RUN go install golang.org/x/lint/golint@latest