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 'clemensbeck-ginkgo-v1-and-v2-side-by-side' into 'master'

Browse source 
Add ginkgo v2 to operator build base

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

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-01-31 06:59:38 +00:00
commit de379a6665
1 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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