From e7e7a7cbe05731215ca197ad3b0a79333cb90206 Mon Sep 17 00:00:00 2001 From: Mitchell Nielsen Date: Thu, 28 Jan 2021 13:13:58 -0500 Subject: [PATCH] Install git and go packages in final target Installs git and go packages in final target, as the go packages on alpine are different than on the non-alpine variant. --- Dockerfile.gitlab-operator-build-base | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile.gitlab-operator-build-base b/Dockerfile.gitlab-operator-build-base index 00d9b8a..b8bee66 100644 --- a/Dockerfile.gitlab-operator-build-base +++ b/Dockerfile.gitlab-operator-build-base @@ -3,10 +3,7 @@ FROM golang:1.14 AS dependencies ARG KUBEBUILDER_VERSION=2.3.1 ARG YQ_VERSION=2.4.1 -RUN go get -u \ - github.com/onsi/ginkgo/ginkgo \ - golang.org/x/lint/golint \ - && curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERSION}/linux/amd64 | tar -xz -C /tmp/ \ +RUN curl -L https://go.kubebuilder.io/dl/${KUBEBUILDER_VERSION}/linux/amd64 | tar -xz -C /tmp/ \ && mv /tmp/kubebuilder_${KUBEBUILDER_VERSION}_linux_amd64 /usr/local/kubebuilder \ && ln -sfv /usr/local/kubebuilder/bin/* /usr/local/bin @@ -24,3 +21,8 @@ COPY --from=dependencies /go /go COPY --from=dependencies /usr/local/kubebuilder /usr/local/kubebuilder COPY --from=dependencies /usr/local/bin/ /usr/local/bin/ COPY --from=dependencies /usr/local/bin/yq /usr/local/bin/yq + +RUN apk add --no-cache git \ + && go get -u \ + github.com/onsi/ginkgo/ginkgo \ + golang.org/x/lint/golint \