From 785ce4f22c098df39bcc203285435a9d4b73985f Mon Sep 17 00:00:00 2001 From: jagger Date: Thu, 27 Jun 2024 17:07:03 +0800 Subject: [PATCH 1/4] fix bug Signed-off-by: jagger Former-commit-id: ea26e0ca40fe911aec7bee7f9c9d9f61227bf52d --- .devops/api.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/api.yml b/.devops/api.yml index 59444726..1ecd581d 100644 --- a/.devops/api.yml +++ b/.devops/api.yml @@ -52,7 +52,7 @@ workflow: docker_username: ((dev.docker_user)) docker_password: ((dev.docker_password)) image_name: '"registry.cn-hangzhou.aliyuncs.com/jcce/pcm-core-api"' - image_tag: 'latest' + image_tag: '"latest"' registry_address: '"registry.cn-hangzhou.aliyuncs.com"' docker_file: git_clone_0.git_path + '/api/Dockerfile' docker_build_path: git_clone_0.git_path From 20f538da5bd6a406fcb4f869c88c59a6ae732ffd Mon Sep 17 00:00:00 2001 From: jagger Date: Thu, 27 Jun 2024 17:26:51 +0800 Subject: [PATCH 2/4] fix bug Signed-off-by: jagger Former-commit-id: e6b870d4a7defcf0bad01f00ec96eb7ace9d2be3 --- api/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index a27e861c..2eeb683f 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.22.4-alpine3.20 AS builder +FROM registry.cn-hangzhou.aliyuncs.com/jcce-images/golang:1.22.4-alpine3.20 AS builder WORKDIR /app @@ -9,7 +9,7 @@ RUN go env -w GO111MODULE=on \ && go env -w CGO_ENABLED=0 RUN go build -o pcm-coordinator-api /app/api/pcm.go -FROM alpine:3.20 +FROM registry.cn-hangzhou.aliyuncs.com/jcce-images/alpine:3.20 WORKDIR /app From 605745d0fe69f9ca95d6930d11ef8b34e3637320 Mon Sep 17 00:00:00 2001 From: jagger Date: Thu, 27 Jun 2024 17:33:10 +0800 Subject: [PATCH 3/4] fix bug Signed-off-by: jagger Former-commit-id: 588fc8dca58443e84711d7ff4719198b3f7a4e94 --- api/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/Dockerfile b/api/Dockerfile index 2eeb683f..afd6ce83 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -6,7 +6,8 @@ COPY . . RUN go env -w GO111MODULE=on \ && go env -w GOPROXY=https://goproxy.cn,direct \ -&& go env -w CGO_ENABLED=0 +&& go env -w CGO_ENABLED=0 \ +&& go mod download RUN go build -o pcm-coordinator-api /app/api/pcm.go FROM registry.cn-hangzhou.aliyuncs.com/jcce-images/alpine:3.20 From 0b23594787f73a549d590915d7bf7211aee85190 Mon Sep 17 00:00:00 2001 From: jagger Date: Thu, 27 Jun 2024 17:42:24 +0800 Subject: [PATCH 4/4] fix bug Signed-off-by: jagger Former-commit-id: e171caddd12aa9e69293ac0b900262fe95e1b657 --- api/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index afd6ce83..9fb6df85 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -7,8 +7,7 @@ COPY . . RUN go env -w GO111MODULE=on \ && go env -w GOPROXY=https://goproxy.cn,direct \ && go env -w CGO_ENABLED=0 \ -&& go mod download -RUN go build -o pcm-coordinator-api /app/api/pcm.go +&& go build -o pcm-coordinator-api /app/api/pcm.go FROM registry.cn-hangzhou.aliyuncs.com/jcce-images/alpine:3.20