From c7847c94365664740cf6218aec9bc4a9c1f03ae1 Mon Sep 17 00:00:00 2001 From: elinuxhenrik Date: Thu, 2 Jun 2022 14:48:38 +0200 Subject: [PATCH] Fix Docker file to copy cert files correctly Issue-ID: NONRTRIC-760 Signed-off-by: elinuxhenrik Change-Id: I50c1a8464f633088b06481fb000c0441a1872cee --- goversion/Dockerfile | 4 ++-- goversion/main.go | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/goversion/Dockerfile b/goversion/Dockerfile index 97beddd..8b4b2bc 100644 --- a/goversion/Dockerfile +++ b/goversion/Dockerfile @@ -16,13 +16,13 @@ RUN go build -o /docker-oruclosedloop ## ## Deploy ## -FROM gcr.io/distroless/base-debian10 +FROM gcr.io/distroless/base-debian11 WORKDIR / ## Copy from "build" stage COPY --from=build /docker-oruclosedloop . -COPY --from=build /app/security/ ./security/ +COPY --from=build /app/security/* /security/ COPY --from=build /app/o-ru-to-o-du-map.csv . USER nonroot:nonroot diff --git a/goversion/main.go b/goversion/main.go index 9a1d45e..a5ccedf 100644 --- a/goversion/main.go +++ b/goversion/main.go @@ -38,6 +38,7 @@ import ( ) const jobId = "14e7bb84-a44d-44c1-90b7-6995a92ad43c" + var job_definition interface{} var jobRegistrationInfo = struct { @@ -93,7 +94,7 @@ func main() { if c, err := restclient.CreateClientCertificate(configuration.ConsumerCertPath, configuration.ConsumerKeyPath); err == nil { cert = c } else { - log.Fatalf("Stopping producer due to error: %v", err) + log.Fatalf("Stopping consumer due to error: %v", err) } client = restclient.CreateRetryClient(cert) -- 2.16.6