NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 18:12:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'remove-ginkgo-v1-from-operator-build' into 'master'

Browse source 
Remove ginkgo v1 from operator build base

Closes gitlab-org/cloud-native/gitlab-operator#411

See merge request https://gitlab.com/gitlab-org/gitlab-build-images/-/merge_requests/640

Merged-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: Balasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: Clemens Beck <cbeck@gitlab.com>
This commit is contained in:
Balasankar 'Balu' C 2023-03-06 09:26:23 +00:00
commit 9639313abf
1 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile.gitlab-operator-build-base-golang-1.18
View file

@ -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