From 81ea6ce81eb8e65170f672f3ae04f79384ecf5d0 Mon Sep 17 00:00:00 2001
From: Admin <184391138@qq.com>
Date: Sat, 24 Feb 2024 17:29:04 +0800
Subject: [PATCH] =?UTF-8?q?feat:dockerFile=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/Dockerfile         | 28 ++++++----------------------
 server/Dockerfile.bak     | 22 ++++++++++++++++++++++
 server/config.docker.yaml |  6 +++---
 server/config.yaml        |  6 +++---
 4 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 server/Dockerfile.bak

diff --git a/server/Dockerfile b/server/Dockerfile
index e493a57..5f870c9 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -1,24 +1,8 @@
-FROM golang:alpine as builder
+FROM golang:1.19.1-alpine
+WORKDIR /data
+ADD ./pychr /data
+ADD ./config.yaml /data
 
-WORKDIR /go/src/pychr/server
-COPY . .
+EXPOSE 8090
 
-RUN go env -w GO111MODULE=on \
-    && go env -w GOPROXY=https://goproxy.cn,direct \
-    && go env -w CGO_ENABLED=0 \
-    && go env \
-    && go mod tidy \
-    && go build -o server .
-
-FROM alpine:latest
-
-LABEL MAINTAINER="SliverHorn@sliver_horn@qq.com"
-
-WORKDIR /go/src/pychr/server
-
-COPY --from=0 /go/src/pychr/server ./
-COPY --from=0 /go/src/pychr/resource ./resource/
-COPY --from=0 /go/src/pychr/config.docker.yaml ./
-
-EXPOSE 8888
-ENTRYPOINT ./server -c config.docker.yaml
+CMD ["/data/pychr"]
diff --git a/server/Dockerfile.bak b/server/Dockerfile.bak
new file mode 100644
index 0000000..8d758a9
--- /dev/null
+++ b/server/Dockerfile.bak
@@ -0,0 +1,22 @@
+FROM golang:alpine as builder
+
+WORKDIR /data
+COPY . .
+
+RUN go env -w GO111MODULE=on \
+    && go env -w GOPROXY=https://goproxy.cn,direct \
+    && go env -w CGO_ENABLED=0 \
+    && go env \
+    && go mod tidy \
+    && go build -o pychr .
+
+FROM alpine:latest
+
+WORKDIR /data
+
+COPY --from=0 /data/pychr ./
+COPY --from=0 /data/resource ./resource/
+COPY --from=0 /data/config.yaml ./
+
+EXPOSE 8888
+ENTRYPOINT ./pychr -c config.yaml
diff --git a/server/config.docker.yaml b/server/config.docker.yaml
index a57e3e2..e3b7de4 100644
--- a/server/config.docker.yaml
+++ b/server/config.docker.yaml
@@ -20,7 +20,7 @@ zap:
 # redis configuration
 redis:
   db: 0
-  addr: 177.7.0.14:6379
+  addr: 127.0.0.1:6379
   password: ""
 
 # mongo configuration
@@ -52,7 +52,7 @@ email:
 # system configuration
 system:
   env: public  # Change to "develop" to skip authentication for development mode
-  addr: 8888
+  addr: 8090
   db-type: mysql
   oss-type: local    # 控制oss选择走本地还是 七牛等其他仓 自行增加其他oss仓可以在 server/utils/upload/upload.go 中 NewOss函数配置
   use-redis: false     # 使用redis
@@ -164,7 +164,7 @@ tencent-cos:
   region: ap-shanghai
   secret-id: your-secret-id
   secret-key: your-secret-key
-  base-url: https://gin.vue.admin
+  base-url: https://www.keephappy.love
   path-prefix: pychr/server
 
 # aws s3 configuration (minio compatible)
diff --git a/server/config.yaml b/server/config.yaml
index 6178be1..56224ea 100644
--- a/server/config.yaml
+++ b/server/config.yaml
@@ -26,7 +26,7 @@ aws-s3:
     endpoint: ""
     secret-id: your-secret-id
     secret-key: your-secret-key
-    base-url: https://gin.vue.admin
+    base-url: https://www.keephappy.love
     path-prefix: pychr/server
     s3-force-path-style: false
     disable-ssl: false
@@ -186,11 +186,11 @@ sqlite:
     singular: false
     log-zap: false
 system:
-    env: local
+    env: release
     db-type: mysql
     oss-type: local
     router-prefix: ""
-    addr: 8888
+    addr: 8090
     iplimit-count: 15000
     iplimit-time: 3600
     use-multipoint: false