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

Fix installation and upgrade kustomize version to 4.5.7 for gitlab-operator-base

Browse source 
These changes were necessary for Go 1.18 to build.
This commit is contained in:
Stan Hu 2023-01-19 10:20:03 -08:00
parent acae923462
commit 358b1623a0
No known key found for this signature in database
GPG key ID: 8D3931AD39CC7A20
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Dockerfile.gitlab-operator-build-base
View file

@ -23,13 +23,11 @@ RUN mkdir -p /src \
## Kustomize ## Kustomize
FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as kustomize FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as kustomize
ARG KUSTOMIZE_VERSION=3.8.10 ARG KUSTOMIZE_VERSION=4.5.7
ENV GOPROXY="https://proxy.golang.org/" ENV GOPROXY="https://proxy.golang.org/"
RUN apk add --no-cache gcc musl-dev RUN apk add --no-cache gcc musl-dev
RUN mkdir /src && cd /src; \ RUN go install sigs.k8s.io/kustomize/kustomize/v4@v${KUSTOMIZE_VERSION}
go mod init tmp && \
go get sigs.k8s.io/kustomize/kustomize/v3@v${KUSTOMIZE_VERSION}
## Controller-gen ## Controller-gen
FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen
@ -37,9 +35,7 @@ FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen
ARG CONTROLLER_GEN_VERSION=0.7.0 ARG CONTROLLER_GEN_VERSION=0.7.0
ENV GOPROXY="https://proxy.golang.org/" ENV GOPROXY="https://proxy.golang.org/"
RUN mkdir /src && cd /src; \ RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION}
go mod init tmp \
&& go get sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION}
## Build ## Build
FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as build
@ -61,9 +57,9 @@ RUN apk add --no-cache podman buildah curl make gcc musl-dev git bash coreutils
# accomodate running podman within docker # accomodate running podman within docker
RUN sed -i 's#^driver.*$#driver = "vfs"#g' /etc/containers/storage.conf RUN sed -i 's#^driver.*$#driver = "vfs"#g' /etc/containers/storage.conf
RUN go get -u \ ARG GINKGO_VERSION=1.16.5
github.com/onsi/ginkgo/ginkgo \ RUN go install github.com/onsi/ginkgo/ginkgo@v${GINKGO_VERSION}
golang.org/x/lint/golint RUN go install golang.org/x/lint/golint@latest
# Kubebuilder # Kubebuilder
RUN mkdir -p /usr/local/kubebuilder/bin \ RUN mkdir -p /usr/local/kubebuilder/bin \