luoyangwei il y a 1 an
Parent
commit
327775d82e
5 fichiers modifiés avec 11 ajouts et 11 suppressions
  1. 4 0
      .dockerignore
  2. 2 8
      Dockerfile
  3. 2 0
      docker-compose.yml
  4. 1 1
      etc/websocket.debug.yaml
  5. 2 2
      etc/websocket.test.yaml

+ 4 - 0
.dockerignore

@@ -0,0 +1,4 @@
+.idea
+.git
+.gitignore
+.gitlab-ci.yml

+ 2 - 8
Dockerfile

@@ -13,15 +13,9 @@ COPY . /app
 # RUN export GOPROXY=https://goproxy.cn,direct && go mod tidy
 # RUN go build -ldflags="-s -w" -o ./bin/server ${APP_RELATIVE_PATH}
 
-# RUN go env -w GOINSECURE='x.sikey.com.cn/*' &&  \
-#     go env -w GONOSUMDB='x.sikey.com.cn/*' && \ 
-#     go env -w GOPRIVATE='x.sikey.com.cn/*'
-
 RUN export GOPROXY=https://goproxy.cn,direct && \
     go mod tidy && \
-    go build -ldflags="-s -w" -o /app/server
-# RUN mv ./etc /app/etc && \
-#     mv /locales /app/locales
+    go build -ldflags="-s -w" -o /app
 
 # ENTRYPOINT ["top"]
 
@@ -42,7 +36,7 @@ WORKDIR /app
 COPY --from=builder /app /app
 
 # EXPOSE ${HTTP_PROT}
-ENTRYPOINT [ "./server" ]
+ENTRYPOINT [ "./websocket" ]
 # ENTRYPOINT [ "top" ]
 
 

+ 2 - 0
docker-compose.yml

@@ -10,3 +10,5 @@ services:
         - APP_ENV=test
     ports:
       - "10060:8080"
+    user:
+      "root"

+ 1 - 1
etc/websocket.debug.yaml

@@ -46,5 +46,5 @@ redis:
 
 # nats connection config
 nats:
-    addr: "nats://106.75.230.4:4333"
+    addr: "nats://106.75.230.4:4222"
     subject: "clients.message" # 消息通道

+ 2 - 2
etc/websocket.test.yaml

@@ -18,7 +18,7 @@ websocket:
     read_wait: 120 # 读超时
     write_buffer_size: 1024 # 写消息体最大的 buffer size
     write_wait: 30 # 写超时
-    nats_url: "nats://106.75.230.4:4333"
+    nats_url: "nats://172.24.0.1:4222"
 
 mysql:
     dsn: "root:9RKdJsEQKnjrni9R@tcp(10.23.148.10:3306)/sikey?charset=utf8mb4&parseTime=true&loc=Local"
@@ -42,5 +42,5 @@ redis:
 
 # nats connection config
 nats:
-    addr: "nats://106.75.230.4:4333"
+    addr: "nats://172.24.0.1:4222"
     subject: "clients.message" # 消息通道