From e154051483eea9b14643927d280f31cd6df85a37 Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Tue, 24 Oct 2023 19:36:35 +0800 Subject: [PATCH 1/2] fix logs bug --- cve-vulner-manager/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cve-vulner-manager/Dockerfile b/cve-vulner-manager/Dockerfile index 2f7615c..ad64b3c 100644 --- a/cve-vulner-manager/Dockerfile +++ b/cve-vulner-manager/Dockerfile @@ -17,10 +17,11 @@ RUN dnf -y update && \ groupadd -g 1000 manager && \ useradd -u 1000 -g manager -s /bin/bash -m manager -USER manager +COPY --chown=manager ./conf/product_app.conf /opt/app/conf/app.conf +COPY --chown=manager --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/app/cve-manager +USER manager WORKDIR /opt/app -COPY --chown=manager ./conf/product_app.conf conf/app.conf -COPY --chown=manager --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager cve-manager +RUN mkdir logs ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file -- Gitee From 11e26d567adbb87a287b4bf653da0a2b419d1083 Mon Sep 17 00:00:00 2001 From: yangwei999 <348134071@qq.com> Date: Wed, 25 Oct 2023 14:12:00 +0800 Subject: [PATCH 2/2] fix golang version --- cve-vulner-manager/Dockerfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/cve-vulner-manager/Dockerfile b/cve-vulner-manager/Dockerfile index ad64b3c..a2f87ef 100644 --- a/cve-vulner-manager/Dockerfile +++ b/cve-vulner-manager/Dockerfile @@ -1,14 +1,10 @@ -FROM openeuler/openeuler:23.03 as BUILDER -RUN dnf update -y && \ - dnf install -y golang && \ - go env -w GOPROXY=https://goproxy.cn,direct - +FROM golang:1.18.8 as BUILDER LABEL maintainer="zhangjianjun" # build binary -WORKDIR /go/src/gitee.com/openeuler/cve-manager -COPY . . -RUN GO111MODULE=on CGO_ENABLED=1 go build -v -o cve-manager . +RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager +COPY . /go/src/gitee.com/openeuler/cve-manager +RUN cd /go/src/gitee.com/openeuler/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go # copy binary config and utils FROM openeuler/openeuler:22.03 -- Gitee