From 9d56161ee69dc296d416ab5fb2ff71f9adeb0525 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Mon, 19 Oct 2020 20:41:03 +0800 Subject: [PATCH 01/32] modeify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index d6bf310..e122194 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,9 +25,9 @@ EXPOSE 80 # copy binary config and utils FROM golang:latest -RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf && cd $APP_DIR -COPY ./src/cve-manager/conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY ./src/cve-manager/cve-manager /opt/cve-manager +RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf +COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf +COPY ./cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From 1d7a8ac98bf1c206f9e5138b92489a9dd4ba1621 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 10:34:03 +0800 Subject: [PATCH 02/32] modify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index e122194..93a1bb8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link -#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./src/cve-manager main.go +RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +#RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./src/cve-manager main.go EXPOSE 80 @@ -27,7 +27,7 @@ EXPOSE 80 FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY ./cve-manager /opt/cve-manager +COPY --from=BUILDER ./cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From 4df6acf2340509ec7ff62fe2bc71379f8d745f40 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 10:36:17 +0800 Subject: [PATCH 03/32] modify dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 93a1bb8..2f8e860 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,8 +18,8 @@ ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link -RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -#RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./src/cve-manager main.go +#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./src/cve-manager main.go EXPOSE 80 -- Gitee From 14184318addbb548fe936c6bc798f026e31ecedc Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 10:39:13 +0800 Subject: [PATCH 04/32] modify dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2f8e860..9bb307f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,7 @@ RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./src/cve-manager main.go EXPOSE 80 # copy binary config and utils -FROM golang:latest +FROM golang:latest as BUILDER RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf COPY --from=BUILDER ./cve-manager /opt/cve-manager -- Gitee From 27a71882849e6797596c26a0160340f9cb64e405 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 10:49:51 +0800 Subject: [PATCH 05/32] modeify dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9bb307f..350bdd9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ EXPOSE 80 FROM golang:latest as BUILDER RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY --from=BUILDER ./cve-manager /opt/cve-manager +COPY $APP_DIR/cve-manager/src/cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From d84ddac0d3bf385934033d780a9a9f20f96e4fe4 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 10:52:45 +0800 Subject: [PATCH 06/32] modeify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 350bdd9..b4d044b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,15 +19,15 @@ ADD . $APP_DIR # Compile the binary and statically link #RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./src/cve-manager main.go +RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 80 # copy binary config and utils -FROM golang:latest as BUILDER +#FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY $APP_DIR/cve-manager/src/cve-manager /opt/cve-manager +COPY $APP_DIR/cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From fa19406aef7986d552b4202ea74511143563edc8 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:01:36 +0800 Subject: [PATCH 07/32] modeify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b4d044b..8263ef5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM centos:latest - +FROM golang:latest as BUILDER MAINTAINER TommyLike FROM library/golang @@ -19,7 +19,7 @@ ADD . $APP_DIR # Compile the binary and statically link #RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +RUN cd /go/src/gitee.com/openeuler/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 80 @@ -27,7 +27,7 @@ EXPOSE 80 #FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY $APP_DIR/cve-manager /opt/cve-manager +COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From 0a22c59c0f71f2717a2d142491edc1ae39982d19 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:03:44 +0800 Subject: [PATCH 08/32] modeify dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8263ef5..65d13c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ADD . $APP_DIR # Compile the binary and statically link #RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd /go/src/gitee.com/openeuler/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +RUN cd /home/cve-manager/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 80 @@ -27,7 +27,7 @@ EXPOSE 80 #FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/cve-manager +COPY --from=BUILDER /home/cve-manager/cve-manager/cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From 5c0149ef5e4f1fa8a6abe55ab60aeb43dc996983 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:13:53 +0800 Subject: [PATCH 09/32] modeify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 65d13c5..6b4ede8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM centos:latest -FROM golang:latest as BUILDER + MAINTAINER TommyLike FROM library/golang @@ -19,7 +19,7 @@ ADD . $APP_DIR # Compile the binary and statically link #RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd /home/cve-manager/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 80 @@ -27,7 +27,7 @@ EXPOSE 80 #FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY --from=BUILDER /home/cve-manager/cve-manager/cve-manager /opt/cve-manager +COPY cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From 4ae4215122fbe79f5015d2dddaa991198ad94e2f Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:22:05 +0800 Subject: [PATCH 10/32] modeify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b4ede8..fc2f68e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,14 +20,14 @@ ADD . $APP_DIR # Compile the binary and statically link #RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go - -EXPOSE 80 +CMD ["bee", "run"] +EXPOSE 8080 # copy binary config and utils #FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY cve-manager /opt/cve-manager +COPY ./cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From d365a5473dd5827ea933c2486e5a4a555b9b01b9 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:35:22 +0800 Subject: [PATCH 11/32] modeify dockerfile --- Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc2f68e..d1c2661 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,16 +18,15 @@ ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link -#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go -CMD ["bee", "run"] +RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +#RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 8080 # copy binary config and utils #FROM golang:latest RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY ./cve-manager /opt/cve-manager +COPY $APP_DIR/src/cve-manager /opt/cve-manager WORKDIR /opt/cve-manager/ ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file -- Gitee From 9950517457f62ef602c740e1bdf32d55e36aca93 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:41:56 +0800 Subject: [PATCH 12/32] modeify dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1c2661..dbcb4f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link -RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +RUN cd $APP_DIR && CGO_ENABLED=1 go build -ldflags '-d -w -s' #RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 8080 -- Gitee From 39b064651a0864c9f19f73d845979937553cd379 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 11:44:06 +0800 Subject: [PATCH 13/32] modeify dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index dbcb4f0..7439b19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ MAINTAINER TommyLike FROM library/golang # Godep for vendoring -RUN go get github.com/tools/godep +RUN go get github.com/tools/godep && CGO_ENABLED=0 go install -a std # Recompile the standard library without CGO -RUN CGO_ENABLED=0 go install -a std +#RUN CGO_ENABLED=0 go install -a std ENV APP_DIR $GOPATH/src/cve-manager RUN mkdir -p $APP_DIR @@ -18,7 +18,7 @@ ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link -RUN cd $APP_DIR && CGO_ENABLED=1 go build -ldflags '-d -w -s' +RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' #RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 8080 -- Gitee From 11d17a16bc1ada459aaf21c9253ab1f3aa4f41d4 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 14:54:15 +0800 Subject: [PATCH 14/32] modeify dockerfile --- Dockerfile | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7439b19..cd1ec56 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,7 @@ RUN go get github.com/tools/godep && CGO_ENABLED=0 go install -a std ENV APP_DIR $GOPATH/src/cve-manager RUN mkdir -p $APP_DIR +WORKDIR $GOPATH/src/cve-manager # Set the entrypoint ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR @@ -21,12 +22,4 @@ ADD . $APP_DIR RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' #RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 8080 - -# copy binary config and utils -#FROM golang:latest -RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf -COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY $APP_DIR/src/cve-manager /opt/cve-manager - -WORKDIR /opt/cve-manager/ -ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file +COPY ./conf/product_app.conf $GOPATH/src/cve-manager/conf/app.conf -- Gitee From 063c0fee1adf05a4440b69185ac2627e382650ac Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 14:56:00 +0800 Subject: [PATCH 15/32] modeify dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index cd1ec56..bc4a9f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link -RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -#RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go EXPOSE 8080 COPY ./conf/product_app.conf $GOPATH/src/cve-manager/conf/app.conf -- Gitee From 8389897d45db434359ca22df20f6ac5947049ba8 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 15:08:06 +0800 Subject: [PATCH 16/32] modeify dockerfile --- Dockerfile | 2 +- conf/product_app.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bc4a9f2..0e32ec8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN go get github.com/tools/godep && CGO_ENABLED=0 go install -a std # Recompile the standard library without CGO #RUN CGO_ENABLED=0 go install -a std -ENV APP_DIR $GOPATH/src/cve-manager +ENV APP_DIR=$GOPATH/src/cve-manager AES_KEY=djS*@+8K9{J!ymk6 LOGIN_KEY=djS*@+8K9{-!yo%64 DB_PWD='1YKvrgF39KrDOYHYtucQ2hNGWKwLf9A1ejoNmLikMe0=' DB_USER=cve GITEE_TOKEN=8457c66db66955376519059b97e33dd1 HOOK_PWD=YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly RUN mkdir -p $APP_DIR WORKDIR $GOPATH/src/cve-manager diff --git a/conf/product_app.conf b/conf/product_app.conf index 24ed4d2..e19d4b3 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -78,7 +78,7 @@ password = "${GITEE_PASSWORD||****}" git_token = "${GITEE_TOKEN||xxx}" [hook] -hookpwd = "${HOOK_PWD||***}" +hookpwd = "${HOOK_PWD||YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly}" hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event -- Gitee From c8a107c162b314e9ff36cca05fd6d3a956217995 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 15:28:19 +0800 Subject: [PATCH 17/32] modeify dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e32ec8..d166ea3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,11 +15,11 @@ RUN mkdir -p $APP_DIR WORKDIR $GOPATH/src/cve-manager # Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) +ENTRYPOINT (cd $APP_DIR && ./cve-manager) ADD . $APP_DIR # Compile the binary and statically link #RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o main.go EXPOSE 8080 COPY ./conf/product_app.conf $GOPATH/src/cve-manager/conf/app.conf -- Gitee From c4fbf1374a6acbe1a36a19bc99c11464d50aae0d Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 15:52:01 +0800 Subject: [PATCH 18/32] modeify dockerfile --- Dockerfile | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index d166ea3..a9bd224 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,17 @@ -FROM centos:latest +FROM golang:latest as BUILDER MAINTAINER TommyLike -FROM library/golang +# build binary +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 -# Godep for vendoring -RUN go get github.com/tools/godep && CGO_ENABLED=0 go install -a std +# copy binary config and utils +FROM golang:latest +RUN mkdir -p /opt/app/ +COPY ./conf/product_app.conf /opt/app/conf/app.conf +# overwrite config yaml +COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/app -# Recompile the standard library without CGO -#RUN CGO_ENABLED=0 go install -a std - -ENV APP_DIR=$GOPATH/src/cve-manager AES_KEY=djS*@+8K9{J!ymk6 LOGIN_KEY=djS*@+8K9{-!yo%64 DB_PWD='1YKvrgF39KrDOYHYtucQ2hNGWKwLf9A1ejoNmLikMe0=' DB_USER=cve GITEE_TOKEN=8457c66db66955376519059b97e33dd1 HOOK_PWD=YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly -RUN mkdir -p $APP_DIR - -WORKDIR $GOPATH/src/cve-manager -# Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./cve-manager) -ADD . $APP_DIR - -# Compile the binary and statically link -#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o main.go -EXPOSE 8080 -COPY ./conf/product_app.conf $GOPATH/src/cve-manager/conf/app.conf +WORKDIR /opt/app/ +ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file -- Gitee From 7b31d68fc045d22e0de54b0444db5fedb0da2374 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 15:54:42 +0800 Subject: [PATCH 19/32] modeify dockerfile --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a9bd224..4d8809d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,12 +3,13 @@ FROM golang:latest as BUILDER MAINTAINER TommyLike # build binary +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 golang:latest -RUN mkdir -p /opt/app/ +RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ COPY ./conf/product_app.conf /opt/app/conf/app.conf # overwrite config yaml COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/app -- Gitee From 3828e9db43a0e2aab4fe51d6b21e11f95e99240c Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 15:57:53 +0800 Subject: [PATCH 20/32] modeify dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d8809d..a81f305 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,16 @@ FROM golang:latest as BUILDER MAINTAINER TommyLike # build binary -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 +#RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager +#COPY . /go/src/gitee.com/openeuler/cve-manager +RUN cd /home/cve-manager/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go # copy binary config and utils FROM golang:latest RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ COPY ./conf/product_app.conf /opt/app/conf/app.conf # overwrite config yaml -COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/app +COPY --from=BUILDER /home/cve-manager/cve-manager/cve-manager /opt/app WORKDIR /opt/app/ ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file -- Gitee From 0a025ba5deef8be363da0aa19cbe71b0633ccbbe Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 15:59:47 +0800 Subject: [PATCH 21/32] modeify dockerfile --- Dockerfile | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index a81f305..d166ea3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,25 @@ -FROM golang:latest as BUILDER +FROM centos:latest MAINTAINER TommyLike -# build binary -#RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager -#COPY . /go/src/gitee.com/openeuler/cve-manager -RUN cd /home/cve-manager/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +FROM library/golang -# copy binary config and utils -FROM golang:latest -RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ -COPY ./conf/product_app.conf /opt/app/conf/app.conf -# overwrite config yaml -COPY --from=BUILDER /home/cve-manager/cve-manager/cve-manager /opt/app +# Godep for vendoring +RUN go get github.com/tools/godep && CGO_ENABLED=0 go install -a std -WORKDIR /opt/app/ -ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file +# Recompile the standard library without CGO +#RUN CGO_ENABLED=0 go install -a std + +ENV APP_DIR=$GOPATH/src/cve-manager AES_KEY=djS*@+8K9{J!ymk6 LOGIN_KEY=djS*@+8K9{-!yo%64 DB_PWD='1YKvrgF39KrDOYHYtucQ2hNGWKwLf9A1ejoNmLikMe0=' DB_USER=cve GITEE_TOKEN=8457c66db66955376519059b97e33dd1 HOOK_PWD=YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly +RUN mkdir -p $APP_DIR + +WORKDIR $GOPATH/src/cve-manager +# Set the entrypoint +ENTRYPOINT (cd $APP_DIR && ./cve-manager) +ADD . $APP_DIR + +# Compile the binary and statically link +#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' +RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o main.go +EXPOSE 8080 +COPY ./conf/product_app.conf $GOPATH/src/cve-manager/conf/app.conf -- Gitee From f8fd0512beb68a1270d3de622dd26398bfe7aba2 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 16:09:38 +0800 Subject: [PATCH 22/32] modeify dockerfile --- Dockerfile | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index d166ea3..a81f305 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,25 +1,18 @@ -FROM centos:latest +FROM golang:latest as BUILDER MAINTAINER TommyLike -FROM library/golang +# build binary +#RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager +#COPY . /go/src/gitee.com/openeuler/cve-manager +RUN cd /home/cve-manager/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go -# Godep for vendoring -RUN go get github.com/tools/godep && CGO_ENABLED=0 go install -a std +# copy binary config and utils +FROM golang:latest +RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ +COPY ./conf/product_app.conf /opt/app/conf/app.conf +# overwrite config yaml +COPY --from=BUILDER /home/cve-manager/cve-manager/cve-manager /opt/app -# Recompile the standard library without CGO -#RUN CGO_ENABLED=0 go install -a std - -ENV APP_DIR=$GOPATH/src/cve-manager AES_KEY=djS*@+8K9{J!ymk6 LOGIN_KEY=djS*@+8K9{-!yo%64 DB_PWD='1YKvrgF39KrDOYHYtucQ2hNGWKwLf9A1ejoNmLikMe0=' DB_USER=cve GITEE_TOKEN=8457c66db66955376519059b97e33dd1 HOOK_PWD=YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly -RUN mkdir -p $APP_DIR - -WORKDIR $GOPATH/src/cve-manager -# Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./cve-manager) -ADD . $APP_DIR - -# Compile the binary and statically link -#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' -RUN cd $APP_DIR && CGO_ENABLED=1 go build -v -o main.go -EXPOSE 8080 -COPY ./conf/product_app.conf $GOPATH/src/cve-manager/conf/app.conf +WORKDIR /opt/app/ +ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file -- Gitee From 329f8a23dfb327b843bfa4616b58629752c9c65a Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 16:11:14 +0800 Subject: [PATCH 23/32] modeify dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index a81f305..4d8809d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,16 +3,16 @@ FROM golang:latest as BUILDER MAINTAINER TommyLike # build binary -#RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager -#COPY . /go/src/gitee.com/openeuler/cve-manager -RUN cd /home/cve-manager/cve-manager && CGO_ENABLED=1 go build -v -o ./cve-manager main.go +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 golang:latest RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ COPY ./conf/product_app.conf /opt/app/conf/app.conf # overwrite config yaml -COPY --from=BUILDER /home/cve-manager/cve-manager/cve-manager /opt/app +COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/app WORKDIR /opt/app/ ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file -- Gitee From 665507f3fc31deb272bb279df643136390ab35b0 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 16:24:19 +0800 Subject: [PATCH 24/32] Dockerfile latest modification --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 4d8809d..7312f68 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,7 @@ FROM golang:latest as BUILDER MAINTAINER TommyLike +ENV APP_DIR=$GOPATH/src/cve-manager AES_KEY=djS*@+8K9{J!ymk6 LOGIN_KEY=djS*@+8K9{-!yo%64 DB_PWD='1YKvrgF39KrDOYHYtucQ2hNGWKwLf9A1ejoNmLikMe0=' DB_USER=cve GITEE_TOKEN=8457c66db66955376519059b97e33dd1 HOOK_PWD=YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly # build binary RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager COPY . /go/src/gitee.com/openeuler/cve-manager -- Gitee From c01df9c00f5579870d734b0bea60163364ef3cba Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 16:49:30 +0800 Subject: [PATCH 25/32] Dockerfile latest modification --- Dockerfile | 1 - conf/product_app.conf | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7312f68..4d8809d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,6 @@ FROM golang:latest as BUILDER MAINTAINER TommyLike -ENV APP_DIR=$GOPATH/src/cve-manager AES_KEY=djS*@+8K9{J!ymk6 LOGIN_KEY=djS*@+8K9{-!yo%64 DB_PWD='1YKvrgF39KrDOYHYtucQ2hNGWKwLf9A1ejoNmLikMe0=' DB_USER=cve GITEE_TOKEN=8457c66db66955376519059b97e33dd1 HOOK_PWD=YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly # build binary RUN mkdir -p /go/src/gitee.com/openeuler/cve-manager COPY . /go/src/gitee.com/openeuler/cve-manager diff --git a/conf/product_app.conf b/conf/product_app.conf index e19d4b3..24ed4d2 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -78,7 +78,7 @@ password = "${GITEE_PASSWORD||****}" git_token = "${GITEE_TOKEN||xxx}" [hook] -hookpwd = "${HOOK_PWD||YpYGtwO0Wiv3mQFy9GIMOq1clP28l0uzhyv8Fiwrm7Ly}" +hookpwd = "${HOOK_PWD||***}" hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event -- Gitee From 82f0b9d8e0b9b4fce8d982422f4d9d502ce0b756 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Mon, 19 Oct 2020 18:59:01 +0800 Subject: [PATCH 26/32] modeify config 1. Dockerfile file error correction; 2. configer error correction modeify configer modeify dockerfile modeify dockerfile,configer modeify dockerfile modeify dockerfile modify dockerfile modify dockerfile modify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile modeify dockerfile Dockerfile latest modification Dockerfile latest modification --- Dockerfile | 36 +++++++++++------------------------- conf/app.conf | 12 ++++++------ conf/product_app.conf | 26 +++++++++++++------------- 3 files changed, 30 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index c4ba403..4d8809d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,32 +1,18 @@ -FROM centos:latest +FROM golang:latest as BUILDER MAINTAINER TommyLike -FROM library/golang - -# Godep for vendoring -RUN go get github.com/tools/godep - -# Recompile the standard library without CGO -RUN CGO_ENABLED=0 go install -a std - -ENV APP_DIR $GOPATH/src/cve-manager -RUN mkdir -p $APP_DIR - -# Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) -ADD . $APP_DIR - -# Compile the binary and statically link -RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' - -EXPOSE 80 +# build binary +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 golang:latest -RUN mkdir -p /opt/cve-manager && mkdir -p /opt/cve-manager/conf -COPY ./conf/product_app.conf /opt/cve-manager/conf/app.conf -COPY ./cve-manager/cve-manager /opt/cve-manager +RUN mkdir -p /opt/app/ && mkdir -p /opt/app/conf/ +COPY ./conf/product_app.conf /opt/app/conf/app.conf +# overwrite config yaml +COPY --from=BUILDER /go/src/gitee.com/openeuler/cve-manager/cve-manager /opt/app -WORKDIR /opt/cve-manager/ -ENTRYPOINT ["/opt/cve-manager/cve-manager"] \ No newline at end of file +WORKDIR /opt/app/ +ENTRYPOINT ["/opt/app/cve-manager"] \ No newline at end of file diff --git a/conf/app.conf b/conf/app.conf index d91af5d..6269b32 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -42,19 +42,19 @@ maxsize=304800 [crontab] ymalflag = 2 -getymal = 00 00 23 * * * +getymal = 00 00 02 * * * cveflag = 2 -getcve = 00 00 01 * * * +getcve = 00 00 03 * * * oricveflag = 2 -oricvecheck = 00 00 02 * * * +oricvecheck = 00 00 05 * * * getissueflag = 2 -getissue = 00 00 03 * * * +getissue = 00 00 05 * * * issueflag = 2 -createissue = * * 01 * * * +createissue = * * 05 * * * test = 0/10 * * * * * gittokenflag = 1 issueoath = * * */20 * * * -genexcelflag = 2 +genexcelflag = 7 genexcel = 00 00 04 * * * days = -30 prcnum = 100 diff --git a/conf/product_app.conf b/conf/product_app.conf index f070c48..24ed4d2 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,5 +1,5 @@ -appname = cve_manager -httpport = 80 +appname = cve-manager +httpport = 8080 runmode = dev autorender = false copyrequestbody = true @@ -23,7 +23,7 @@ labelUnFix = "CVE/UNFIX" [mysql] -dbhost = fafd55e8084b402d9998539b072eef7fin01.internal.ap-southeast-1.mysql.rds.myhuaweicloud.com +dbhost = 172.16.1.73 dbport = 3306 dbuser = "${DB_USER||cve}" dbpwd = "${DB_PWD||***}" @@ -41,24 +41,24 @@ maxlines=50000 maxsize=304800 [crontab] -ymalflag = 1 -getymal = 00 00 23 * * * +ymalflag = 2 +getymal = 00 00 02 * * * cveflag = 2 -getcve = 00 00 01 * * * +getcve = 00 00 03 * * * oricveflag = 2 -oricvecheck = 00 00 02 * * * +oricvecheck = 00 00 05 * * * getissueflag = 2 -getissue = 00 00 03 * * * +getissue = 00 00 05 * * * issueflag = 2 -createissue = * * 01 * * * +createissue = * * 05 * * * test = 0/10 * * * * * gittokenflag = 1 issueoath = * * */20 * * * -genexcelflag = 2 +genexcelflag = 7 genexcel = 00 00 04 * * * days = -30 prcnum = 100 -printlogflag = 2 +printlogflag = 1 printlog = 0 */10 * * * * @@ -66,7 +66,7 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -redirect_uri = http://159.138.2.2:80/v1/issue/oauth/callback +#redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** @@ -79,7 +79,7 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -hookurl = http://159.138.2.2:80/v1/issue/hook/event +hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event -- Gitee From 6014c470c7ea7a92b7f10037448f7f3ccdefaee9 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 17:44:31 +0800 Subject: [PATCH 27/32] modify dockerfile --- conf/product_app.conf | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/conf/product_app.conf b/conf/product_app.conf index 24ed4d2..27beb8f 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,4 +1,8 @@ +<<<<<<< HEAD appname = cve-manager +======= +appname = cve_manager +>>>>>>> f07abaa... modeify config httpport = 8080 runmode = dev autorender = false @@ -66,7 +70,11 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com +<<<<<<< HEAD #redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback +======= +redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback +>>>>>>> f07abaa... modeify config scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** @@ -79,7 +87,11 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" +<<<<<<< HEAD hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event +======= +hookurl = https://api.openeuler.org/v1/issue/hook/event +>>>>>>> f07abaa... modeify config -- Gitee From a99a5d230dda5e56d8a0c11e1b141df980450442 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 17:55:32 +0800 Subject: [PATCH 28/32] merge commit --- conf/product_app.conf | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/conf/product_app.conf b/conf/product_app.conf index 27beb8f..24ed4d2 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,8 +1,4 @@ -<<<<<<< HEAD appname = cve-manager -======= -appname = cve_manager ->>>>>>> f07abaa... modeify config httpport = 8080 runmode = dev autorender = false @@ -70,11 +66,7 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -<<<<<<< HEAD #redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback -======= -redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback ->>>>>>> f07abaa... modeify config scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** @@ -87,11 +79,7 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -<<<<<<< HEAD hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event -======= -hookurl = https://api.openeuler.org/v1/issue/hook/event ->>>>>>> f07abaa... modeify config -- Gitee From 0fa1dbe90d0d8022710242e11f3c49199ae22e66 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 18:05:40 +0800 Subject: [PATCH 29/32] =?UTF-8?q?modify=20dockerfile=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/product_app.conf | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/conf/product_app.conf b/conf/product_app.conf index 27beb8f..24ed4d2 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,8 +1,4 @@ -<<<<<<< HEAD appname = cve-manager -======= -appname = cve_manager ->>>>>>> f07abaa... modeify config httpport = 8080 runmode = dev autorender = false @@ -70,11 +66,7 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -<<<<<<< HEAD #redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback -======= -redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback ->>>>>>> f07abaa... modeify config scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** @@ -87,11 +79,7 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -<<<<<<< HEAD hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event -======= -hookurl = https://api.openeuler.org/v1/issue/hook/event ->>>>>>> f07abaa... modeify config -- Gitee From 839b0322fa805b1e99fd6baa07ff1685f04543a3 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 18:12:13 +0800 Subject: [PATCH 30/32] merge commit --- Dockerfile | 24 ++++++++++++++++++++---- conf/product_app.conf | 11 ++++++++++- 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d8809d..8050d75 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,26 @@ FROM golang:latest as BUILDER MAINTAINER TommyLike -# build binary -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 +FROM library/golang + +# Godep for vendoring +RUN go get github.com/tools/godep + +# Recompile the standard library without CGO +RUN CGO_ENABLED=0 go install -a std + +ENV APP_DIR $GOPATH/src/ve-manager +RUN mkdir -p $APP_DIR + +# Set the entrypoint +ENTRYPOINT (cd $APP_DIR && ./src/ve-manager) +ADD . $APP_DIR + +# Compile the binary and statically link +#RUN cd $APP_DIR && CGO_ENABLED=0 godep go build -ldflags '-d -w -s' + +EXPOSE 80 + # copy binary config and utils FROM golang:latest diff --git a/conf/product_app.conf b/conf/product_app.conf index 24ed4d2..bd09377 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,4 +1,8 @@ +<<<<<<< HEAD appname = cve-manager +======= +appname = cve_manager +>>>>>>> f07abaa... modeify config httpport = 8080 runmode = dev autorender = false @@ -66,8 +70,11 @@ printlog = 0 */10 * * * * owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com + #redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback + + scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails # Obtain first from the system environment variables, use the default value if it fails **** client_id = "${GITEE_CLIENT_ID||****}" @@ -79,7 +86,9 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event + +hookurl = https://api.openeuler.org/v1/issue/hook/event + -- Gitee From c37604452a2722cdeb463f1af7dd6f4b27555392 Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 18:15:36 +0800 Subject: [PATCH 31/32] =?UTF-8?q?modify=20dockerfile=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++-- conf/product_app.conf | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8050d75..acd8ce9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,11 +10,11 @@ RUN go get github.com/tools/godep # Recompile the standard library without CGO RUN CGO_ENABLED=0 go install -a std -ENV APP_DIR $GOPATH/src/ve-manager +ENV APP_DIR $GOPATH/src/cve-manager RUN mkdir -p $APP_DIR # Set the entrypoint -ENTRYPOINT (cd $APP_DIR && ./src/ve-manager) +ENTRYPOINT (cd $APP_DIR && ./src/cve-manager) ADD . $APP_DIR # Compile the binary and statically link diff --git a/conf/product_app.conf b/conf/product_app.conf index bd09377..4429d1e 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -1,8 +1,4 @@ -<<<<<<< HEAD appname = cve-manager -======= -appname = cve_manager ->>>>>>> f07abaa... modeify config httpport = 8080 runmode = dev autorender = false @@ -71,8 +67,7 @@ owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -#redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback - +#redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails -- Gitee From 6a1274d6d4e3365326d8fccbd7d16ba09d64d06a Mon Sep 17 00:00:00 2001 From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com> Date: Tue, 20 Oct 2020 18:17:29 +0800 Subject: [PATCH 32/32] =?UTF-8?q?modify=20dockerfile=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conf/product_app.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/product_app.conf b/conf/product_app.conf index 4429d1e..383db5b 100644 --- a/conf/product_app.conf +++ b/conf/product_app.conf @@ -67,7 +67,8 @@ owner = src-openeuler path = jasper email = 7844966+zhangjianjun_code@user.noreply.gitee.com -#redirect_uri = https://api.openeuler.org/v1/issue/oauth/callback +#redirect_uri = https://api.openeuler.org/cve-manager/v1/issue/oauth/callback + scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails @@ -82,7 +83,8 @@ git_token = "${GITEE_TOKEN||xxx}" [hook] hookpwd = "${HOOK_PWD||***}" -hookurl = https://api.openeuler.org/v1/issue/hook/event +hookurl = https://api.openeuler.org/cve-manager/v1/issue/hook/event + -- Gitee