From ba42e2585a17ed87be8383d8712ccc27fa1f9a86 Mon Sep 17 00:00:00 2001 From: Piotr Halama Date: Thu, 25 Apr 2024 09:59:50 +0200 Subject: [PATCH] Revert image workspace change --- components/operator/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/operator/Dockerfile b/components/operator/Dockerfile index 1fb3277b9..8f00be5b2 100644 --- a/components/operator/Dockerfile +++ b/components/operator/Dockerfile @@ -6,7 +6,7 @@ # Build the operator binary FROM golang:1.22.1 as builder -WORKDIR /app +WORKDIR /workspace # Copy the Go Modules manifests COPY go.mod go.sum ./ @@ -26,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a -o operator ./components/o # Bumping serverless images in the values.yaml - used for building "local" and "dev" images FROM alpine:3.19.1 as replacer -WORKDIR /app +WORKDIR /workspace ARG PURPOSE ARG IMG_DIRECTORY @@ -52,8 +52,8 @@ RUN if [[ "local" = "$PURPOSE" ]] ; then ./hack/replace_serverless_chart_images. FROM gcr.io/distroless/static:nonroot WORKDIR / -COPY --chown=65532:65532 --from=builder /app/operator . -COPY --chown=65532:65532 --from=replacer /app/config/serverless /module-chart +COPY --chown=65532:65532 --from=builder /workspace/operator . +COPY --chown=65532:65532 --from=replacer /workspace/config/serverless /module-chart USER 65532:65532 ENTRYPOINT ["/operator"]