From 8ffcf6dcfd763cf327e1605db12a3fc69e4b878a Mon Sep 17 00:00:00 2001 From: Damiano Albani Date: Sun, 9 Jul 2023 16:27:52 +0200 Subject: [PATCH] Use UBI-based image for Go builder --- docker/Dockerfile | 5 ++--- docker/Dockerfile.k8s | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 85e6d334e..e9ad05de0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,4 @@ -FROM golang:1.19-bullseye -RUN apt-get update -y && apt-get install -y libkrb5-dev +FROM registry.access.redhat.com/ubi8/go-toolset:1.19 WORKDIR /opt/pbm COPY . . RUN make install @@ -14,7 +13,7 @@ LABEL org.opencontainers.image.authors="info@percona.com" COPY LICENSE /licenses/ -COPY --from=0 /go/bin/pbm /go/bin/pbm-agent /go/bin/pbm-speed-test /usr/local/bin/ +COPY --from=0 /opt/app-root/src/go/bin/pbm /opt/app-root/src/go/bin/pbm-agent /opt/app-root/src/go/bin/pbm-speed-test /usr/local/bin/ USER nobody diff --git a/docker/Dockerfile.k8s b/docker/Dockerfile.k8s index 7848ec88e..34d48432e 100644 --- a/docker/Dockerfile.k8s +++ b/docker/Dockerfile.k8s @@ -1,5 +1,4 @@ -FROM golang:1.19-bullseye -RUN apt-get update -y && apt-get install -y libkrb5-dev +FROM registry.access.redhat.com/ubi8/go-toolset:1.19 WORKDIR /opt/pbm COPY . . RUN make install-k8s @@ -49,7 +48,7 @@ RUN set -ex; \ RUN microdnf install percona-server-mongodb-shell -COPY --from=0 /go/bin/pbm /go/bin/pbm-agent /go/bin/pbm-agent-entrypoint /go/bin/pbm-speed-test /usr/bin/ +COPY --from=0 /opt/app-root/src/go/bin/pbm /opt/app-root/src/go/bin/pbm-agent /opt/app-root/src/go/bin/pbm-agent-entrypoint /opt/app-root/src/go/bin/pbm-speed-test /usr/bin/ COPY ./docker/start-agent.sh /start-agent.sh USER nobody