From d83a2e91248563785473308e9b8af4c46a89b1ba Mon Sep 17 00:00:00 2001
From: Dmitry Makovey <dmakovey@gitlab.com>
Date: Thu, 14 Oct 2021 10:44:33 -0600
Subject: [PATCH] move opm up in the build stack. use older alpine for opm
 build

---
 Dockerfile.gitlab-operator-build-base | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/Dockerfile.gitlab-operator-build-base b/Dockerfile.gitlab-operator-build-base
index ac130ab..ec722cd 100644
--- a/Dockerfile.gitlab-operator-build-base
+++ b/Dockerfile.gitlab-operator-build-base
@@ -1,21 +1,11 @@
 ARG GOLANG_VERSION=1.16
 # 3.14 presents challenges: https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
 ARG ALPINE_VERSION=3.14
-
-## Kustomize
-FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as kustomize
-
-ARG KUSTOMIZE_VERSION=3.8.10
-ENV GOPROXY="https://proxy.golang.org/"
-
-RUN apk add --no-cache gcc musl-dev
-RUN mkdir /src && cd /src; \
-      go mod init tmp && \
-      go get sigs.k8s.io/kustomize/kustomize/v3@v${KUSTOMIZE_VERSION}
+ARG OPM_ALPINE_VERSION=3.13
 
 ## Opm
 
-FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as opm
+FROM golang:${GOLANG_VERSION}-alpine${OPM_ALPINE_VERSION} as opm
 
 ARG OPM_VERSION=1.19.0
 ENV GOPROXY="https://proxy.golang.org/"
@@ -31,6 +21,17 @@ RUN mkdir -p /src \
     && cd operator-registry \
     && make bin/opm
 
+## Kustomize
+FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as kustomize
+
+ARG KUSTOMIZE_VERSION=3.8.10
+ENV GOPROXY="https://proxy.golang.org/"
+
+RUN apk add --no-cache gcc musl-dev
+RUN mkdir /src && cd /src; \
+      go mod init tmp && \
+      go get sigs.k8s.io/kustomize/kustomize/v3@v${KUSTOMIZE_VERSION}
+
 ## Controller-gen
 FROM golang:${GOLANG_VERSION}-alpine${ALPINE_VERSION} as controller-gen