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

Merge branch 'sh-upgrade-gitlab-operator-base' into 'master'

Browse source 
Upgrade gitlab-operator-build-base image to Go 1.18.10

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

Merged-by: Stan Hu <stanhu@gmail.com>
Approved-by: Mitchell Nielsen <mnielsen@gitlab.com>
Reviewed-by: Mitchell Nielsen <mnielsen@gitlab.com>
This commit is contained in:
Stan Hu 2023-01-24 01:24:08 +00:00
commit 8de66cf7c8
2 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab/ci/custom.images.yml
View file

@ -57,8 +57,8 @@ terraform:
golangci-lint-alpine: golangci-lint-alpine:
extends: .build_and_deploy extends: .build_and_deploy
# Used by gitlab-operator: https://gitlab.com/gitlab-org/gl-openshift/gitlab-operator # Used by gitlab-operator: https://gitlab.com/gitlab-org/cloud-native/gitlab-operator
gitlab-operator-build-base: gitlab-operator-build-base-golang-1.18:
extends: .build_and_deploy extends: .build_and_deploy
alpine-bash-jq-curl-git: alpine-bash-jq-curl-git:

24
Dockerfile.gitlab-operator-build-base → Dockerfile.gitlab-operator-build-base-golang-1.18
View file

@ -1,8 +1,6 @@
ARG GOLANG_VERSION=1.16 ARG GOLANG_VERSION=1.18
ARG ALPINE_VERSION=3.14 ARG ALPINE_VERSION=3.15
# 3.14 presents challenges: https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2 ARG OPM_ALPINE_VERSION=3.15
# while building OPM. 3.13 has no issues
ARG OPM_ALPINE_VERSION=3.13
## Opm ## Opm
@ -25,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
@ -39,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
@ -63,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 \