fix

2023-08-03 16:49:25 +08:00 · 2023-08-03 16:49:25 +08:00 · 9f01ecaf80
commit 9f01ecaf80
parent b40293fdd9
20 changed files with 47 additions and 19 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,7 +4,7 @@
 *.dll
 *.so
 *.dylib
-
+bin/
 # Test binary, built with `go test -c`
 *.test

--- a/fs_package_docker_image.sh
+++ b/fs_package_docker_image.sh
@ -0,0 +1,10 @@
+#!/bin/bash
+name=${1%%\\*}
+#进入对应服务目录
+cd server/$name
+#构建二进制文件
+CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -o ./bin/api-$name-srv  ./$name.go
+#删除之前旧的镜像
+docker rmi -f api-$name-srv:latest
+#打包docker镜像
+docker build -t api-$name-srv:latest .
--- a/server/assistant/Dockerfile
+++ b/server/assistant/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-assistant-srv  /www/fusenapi/
+COPY ./bin/api-assistant-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-assistant-srv"]
--- a/server/backend/Dockerfile
+++ b/server/backend/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-backend-srv  /www/fusenapi/
+COPY ./bin/api-backend-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-backend-srv"]
--- a/server/canteen/Dockerfile
+++ b/server/canteen/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-canteen-srv  /www/fusenapi/
+COPY ./bin/api-canteen-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-canteen-srv"]
--- a/server/data-transfer/Dockerfile
+++ b/server/data-transfer/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-data-transfer-srv  /www/fusenapi/
+COPY ./bin/api-data-transfer-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-data-transfer-srv"]
--- a/server/home-user-auth/Dockerfile
+++ b/server/home-user-auth/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-home-user-auth-srv  /www/fusenapi/
+COPY ./bin/api-home-user-auth-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-home-user-auth-srv"]
--- a/server/inventory/Dockerfile
+++ b/server/inventory/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-inventory-srv  /www/fusenapi/
+COPY ./bin/api-inventory-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-inventory-srv"]
--- a/server/map-library/Dockerfile
+++ b/server/map-library/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-map-library-srv  /www/fusenapi/
+COPY ./bin/api-map-library-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-map-library-srv"]
--- a/server/orders/Dockerfile
+++ b/server/orders/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-order-srv  /www/fusenapi/
+COPY ./bin/api-order-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-order-srv"]
--- a/server/pay/Dockerfile
+++ b/server/pay/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-pay-srv  /www/fusenapi/
+COPY ./bin/api-pay-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-pay-srv"]
--- a/server/product-model/Dockerfile
+++ b/server/product-model/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-product-model-srv  /www/fusenapi/
+COPY ./bin/api-product-model-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-product-model-srv"]
--- a/server/product-template-tag/Dockerfile
+++ b/server/product-template-tag/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-product-template-tag-srv  /www/fusenapi/
+COPY ./bin/api-product-template-tag-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-product-template-tag-srv"]
--- a/server/product-template/Dockerfile
+++ b/server/product-template/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-product-template-srv  /www/fusenapi/
+COPY ./bin/api-product-template-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-product-template-srv"]
--- a/server/product/Dockerfile
+++ b/server/product/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-product-srv  /www/fusenapi/
+COPY ./bin/api-product-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-product-srv"]
--- a/server/render/Dockerfile
+++ b/server/render/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-render-srv  /www/fusenapi/
+COPY ./bin/api-render-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-render-srv"]
--- a/server/shopping-cart-confirmation/Dockerfile
+++ b/server/shopping-cart-confirmation/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-shopping-cart-confirmation-srv  /www/fusenapi/
+COPY ./bin/api-shopping-cart-confirmation-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-shopping-cart-confirmation-srv"]
--- a/server/upload/Dockerfile
+++ b/server/upload/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-upload-srv  /www/fusenapi/
+COPY ./bin/api-upload-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-upload-srv"]
--- a/server/webset/Dockerfile
+++ b/server/webset/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-webset-srv  /www/fusenapi/
+COPY ./bin/api-webset-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-webset-srv"]
--- a/server/websocket/Dockerfile
+++ b/server/websocket/Dockerfile
@ -1,5 +1,6 @@
 FROM alpine

 WORKDIR /www/fusenapi/
-COPY ./api-websocket-srv  /www/fusenapi/
+COPY ./bin/api-websocket-srv  /www/fusenapi/
+COPY ./etc   /www/fusenapi/etc
 CMD ["/www/fusenapi/api-websocket-srv"]