From 41949bef7247cfe461b287ddadd76fba92b5b5bf Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 9 Oct 2023 15:15:44 +0800 Subject: [PATCH] fix --- fs_package_docker_image.sh | 8 ++++++++ server/auth/Dockerfile | 4 +++- server/canteen/Dockerfile | 4 +++- server/collection/Dockerfile | 4 +++- server/data-transfer/Dockerfile | 4 +++- server/home-user-auth/Dockerfile | 4 +++- server/map-library/Dockerfile | 4 +++- server/pay/Dockerfile | 4 +++- server/product-model/Dockerfile | 4 +++- server/product-template-tag/Dockerfile | 4 +++- server/product-template/Dockerfile | 4 +++- server/product/Dockerfile | 3 +++ server/shopping-cart/Dockerfile | 4 +++- server/upload/Dockerfile | 4 +++- server/webset/Dockerfile | 4 +++- server/websocket/Dockerfile | 4 +++- 16 files changed, 53 insertions(+), 14 deletions(-) diff --git a/fs_package_docker_image.sh b/fs_package_docker_image.sh index bb9fe4e5..096f8b13 100755 --- a/fs_package_docker_image.sh +++ b/fs_package_docker_image.sh @@ -2,6 +2,10 @@ name=${1%%\\*} #进入对应服务目录 cd server/$name +#把https加密密钥对复制进来 +cp /opt/env.yaml ./ +cp /opt/server.fusen.3718.cn.pem ./ +cp /opt/server.fusen.3718.cn.key ./ #构建二进制文件 CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ./bin/api-$name-srv ./$name.go #删除之前旧的镜像 @@ -9,6 +13,10 @@ docker rmi -f api-$name-srv:latest docker rmi -f registry.cn-hangzhou.aliyuncs.com/fusen-test/fusen_docker_hub:latest #打包docker镜像 docker build -t api-$name-srv:latest . +#删除临时复制进来的文件 +rm ./env.yaml +rm ./server.fusen.3718.cn.pem +rm ./server.fusen.3718.cn.key #打tag(测试环境，正式把命名空间fusentest改成fusen) docker tag api-$name-srv:latest registry.cn-hangzhou.aliyuncs.com/fusen-test/$name:latest #推送到阿里云镜像库(测试环境，正式把命名空间fusentest改成fusen) diff --git a/server/auth/Dockerfile b/server/auth/Dockerfile index 55d617cc..a9856fa9 100755 --- a/server/auth/Dockerfile +++ b/server/auth/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-assistant-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-assistant-srv"] diff --git a/server/canteen/Dockerfile b/server/canteen/Dockerfile index a268222d..025f6e60 100755 --- a/server/canteen/Dockerfile +++ b/server/canteen/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-canteen-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-canteen-srv"] diff --git a/server/collection/Dockerfile b/server/collection/Dockerfile index 051e9504..a97329a9 100755 --- a/server/collection/Dockerfile +++ b/server/collection/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-collection-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-collection-srv"] diff --git a/server/data-transfer/Dockerfile b/server/data-transfer/Dockerfile index 82090c4b..fed55f76 100755 --- a/server/data-transfer/Dockerfile +++ b/server/data-transfer/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-data-transfer-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-data-transfer-srv"] diff --git a/server/home-user-auth/Dockerfile b/server/home-user-auth/Dockerfile index 3c7a0da5..91734fe2 100755 --- a/server/home-user-auth/Dockerfile +++ b/server/home-user-auth/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-home-user-auth-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-home-user-auth-srv"] diff --git a/server/map-library/Dockerfile b/server/map-library/Dockerfile index 460cbfd5..2cfa5e86 100755 --- a/server/map-library/Dockerfile +++ b/server/map-library/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-map-library-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-map-library-srv"] diff --git a/server/pay/Dockerfile b/server/pay/Dockerfile index df5dab5b..83609c84 100755 --- a/server/pay/Dockerfile +++ b/server/pay/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-pay-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-pay-srv"] diff --git a/server/product-model/Dockerfile b/server/product-model/Dockerfile index e207b762..b13ef0b3 100755 --- a/server/product-model/Dockerfile +++ b/server/product-model/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-product-model-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-product-model-srv"] diff --git a/server/product-template-tag/Dockerfile b/server/product-template-tag/Dockerfile index abc15189..9c4000b0 100755 --- a/server/product-template-tag/Dockerfile +++ b/server/product-template-tag/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-product-template-tag-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-product-template-tag-srv"] diff --git a/server/product-template/Dockerfile b/server/product-template/Dockerfile index 2012a6d9..479efdad 100755 --- a/server/product-template/Dockerfile +++ b/server/product-template/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-product-template-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-product-template-srv"] diff --git a/server/product/Dockerfile b/server/product/Dockerfile index d61adfe3..4e67a467 100755 --- a/server/product/Dockerfile +++ b/server/product/Dockerfile @@ -2,4 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-product-srv /www/fusenapi/ +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-product-srv"] diff --git a/server/shopping-cart/Dockerfile b/server/shopping-cart/Dockerfile index a77012e3..71eda70f 100755 --- a/server/shopping-cart/Dockerfile +++ b/server/shopping-cart/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-shopping-cart-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-shopping-cart-srv"] diff --git a/server/upload/Dockerfile b/server/upload/Dockerfile index b3ee358e..1a4d0f34 100755 --- a/server/upload/Dockerfile +++ b/server/upload/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-upload-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-upload-srv"] diff --git a/server/webset/Dockerfile b/server/webset/Dockerfile index 7cbcc7eb..566081b6 100755 --- a/server/webset/Dockerfile +++ b/server/webset/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-webset-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-webset-srv"] diff --git a/server/websocket/Dockerfile b/server/websocket/Dockerfile index e183ac2b..8659875c 100755 --- a/server/websocket/Dockerfile +++ b/server/websocket/Dockerfile @@ -2,5 +2,7 @@ FROM alpine WORKDIR /www/fusenapi/ COPY ./bin/api-websocket-srv /www/fusenapi/ -COPY ./etc /www/fusenapi/etc +COPY ./env.yaml /opt/ +COPY ./server.fusen.3718.cn.pem /opt/ +COPY ./server.fusen.3718.cn.key /opt/ CMD ["/www/fusenapi/api-websocket-srv"]