feat: 更新部署脚本

README.md

@@ -224,7 +224,7 @@ normal : 正常通知, error : 系统报错通知
 
 ### 使用官方镜像 : 
 
-两种镜像模式选一种即可
+两种镜像模式选一种即可, 注意 127.0.0.1:8444 可以按需调整，具体参考上面文档的websocket配置说明部分
 
 http模式镜像:
 
@@ -246,24 +246,39 @@ https模式镜像:
 
     docker run --name=socket-server -p 8444:8444 -e "WSS_HOST=wss://127.0.0.1:8444" -d iamtsm/tl-rtc-file-socket-server serversocket
 
+### 使用官方镜像(docker-compose) : 
 
-### 自己打包镜像 : 
+两种镜像模式选一种即可
 
-两种模式选一种操作即可
+http模式镜像: 
 
-http模式启动:
+    修改 `docker/local.env`
+
+    docker-compose --profile=local up -d
+
+https模式镜像:
+
+    修改 `docker/server.env`
+
+    docker-compose --profile=server up -d
+
+### 打包自己的镜像 : 
+
+进入docker目录后，两种模式选一种操作即可
+
+打包http模式镜像:
 
     修改 `docker/local.env` 中的配置信息或者按需配置conf.json中的ws, 或者wss (需要填容器的ip，端口信息)
     
-    docker-compose --profile=local up -d
+    docker-compose -f docker-compose-build-code.yml --profile=local build
 
     访问 : http://localhost:9092 或者 http://本机ip:9092
 
-https模式启动:
+打包https模式镜像:
 
-    修改 `docker/local.env` 中的配置信息或者按需配置conf.json中的ws, 或者wss (需要填容器的ip，端口信息)
+    修改 `docker/server.env` 中的配置信息或者按需配置conf.json中的ws, 或者wss (需要填容器的ip，端口信息)
     
-    docker-compose --profile=server up -d
+    docker-compose -f docker-compose-build-code.yml --profile=server build
 
     访问 : https://localhost:9092 或者 https://本机ip:9092
 

bin/auto-publish-local-to-hub.sh

@@ -1,12 +1,23 @@
-docker-compose --profile=local build
+#!/bin/bash
 
-docker tag tl-rtc-file-git-api-local:latest iamtsm/tl-rtc-file-api-local
+build_version=latest
-docker tag tl-rtc-file-git-socket-local:latest iamtsm/tl-rtc-file-socket-local
+hub_version=v1.0.0
 
-docker push iamtsm/tl-rtc-file-api-local
+## build by docker-compose-build-code.yml
-docker push iamtsm/tl-rtc-file-socket-local
+docker-compose -f ../docker/docker-compose-build-code.yml --profile=local build
 
-docker rmi tl-rtc-file-git-api-local
+## tag
-docker rmi tl-rtc-file-git-socket-local
+docker tag docker-tl-rtc-file-api-local:$build_version iamtsm/tl-rtc-file-api-local:$hub_version
-docker rmi iamtsm/tl-rtc-file-api-local
+docker tag docker-tl-rtc-file-socket-local:$build_version iamtsm/tl-rtc-file-socket-local:$hub_version
-docker rmi iamtsm/tl-rtc-file-socket-local
+
+## push to hub version and latest
+docker push iamtsm/tl-rtc-file-api-local:$hub_version
+docker push iamtsm/tl-rtc-file-socket-local:$hub_version
+docker push iamtsm/tl-rtc-file-api-local:latest
+docker push iamtsm/tl-rtc-file-socket-local:latest
+
+## remove local images
+docker rmi docker-tl-rtc-file-api-local:$build_version
+docker rmi docker-tl-rtc-file-socket-local:$build_version
+docker rmi iamtsm/tl-rtc-file-api-local:$hub_version
+docker rmi iamtsm/tl-rtc-file-socket-local:$hub_version

bin/auto-publish-server-to-hub.sh

@@ -1,12 +1,23 @@
-docker-compose --profile=server build
+#!/bin/bash
 
-docker tag tl-rtc-file-git-api-server:latest iamtsm/tl-rtc-file-api-server
+build_version=latest
-docker tag tl-rtc-file-git-socket-server:latest iamtsm/tl-rtc-file-socket-server
+hub_version=v1.0.0
 
-docker push iamtsm/tl-rtc-file-api-server
+## build by docker-compose-build-code.yml
-docker push iamtsm/tl-rtc-file-socket-server
+docker-compose -f ../docker/docker-compose-build-code.yml --profile=server build
 
-docker rmi tl-rtc-file-git-api-server
+## tag
-docker rmi tl-rtc-file-git-socket-server
+docker tag docker-tl-rtc-file-api-server:$build_version iamtsm/tl-rtc-file-api-server:$hub_version
-docker rmi iamtsm/tl-rtc-file-api-server
+docker tag docker-tl-rtc-file-socket-server:$build_version iamtsm/tl-rtc-file-socket-server:$hub_version
-docker rmi iamtsm/tl-rtc-file-socket-server
+
+## push to hub version and latest
+docker push iamtsm/tl-rtc-file-api-server:$hub_version
+docker push iamtsm/tl-rtc-file-socket-server:$hub_version
+docker push iamtsm/tl-rtc-file-api-server:latest
+docker push iamtsm/tl-rtc-file-socket-server:latest
+
+## remove server images
+docker rmi docker-tl-rtc-file-api-server:$build_version
+docker rmi docker-tl-rtc-file-socket-server:$build_version
+docker rmi iamtsm/tl-rtc-file-api-server:$hub_version
+docker rmi iamtsm/tl-rtc-file-socket-server:$hub_version

bin/linux/auto-start-docker-local.sh

@@ -1 +0,0 @@
-docker-compose --profile=local up -d

bin/linux/auto-start-docker-server.sh

@@ -1 +0,0 @@
-docker-compose --profile=server up -d

bin/linux/auto-start-local.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 cd ../../svr/
 
 pm2 start npm --name=tl-rtc-file-api-local -- run lapi

bin/linux/auto-start-server.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 cd ../../svr/
 
 pm2 start npm --name=tl-rtc-file-api-server -- run sapi

bin/linux/auto-stop.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 pm2 stop all
 
 echo "stop all pm2 processes ok"

docker-compose.yml

@@ -2,36 +2,40 @@ version: '3'
 services:
   api-local:
     profiles: ['local']
+    container_name: tl-rtc-file-api-local
+    image: iamtsm/tl-rtc-file-api-local
     env_file:
     - docker/local.env
-    build: .
     ports:
     - 9092:9092
     command: localapi
 
   socket-local:
     profiles: ['local']
+    container_name: tl-rtc-file-socket-local
+    image: iamtsm/tl-rtc-file-socket-local
     env_file:
     - docker/local.env
-    build: .
     ports:
     - 8444:8444
     command: localsocket
 
   api-server:
     profiles: ['server']
+    container_name: tl-rtc-file-api-server
+    image: iamtsm/tl-rtc-file-api-server
     env_file:
     - docker/server.env
-    build: .
     ports:
     - 9092:9092
     command: serverapi
 
   socket-server:
     profiles: ['server']
+    container_name: tl-rtc-file-socket-server
+    image: iamtsm/tl-rtc-file-socket-server
     env_file:
     - docker/server.env
-    build: .
     ports:
     - 8444:8444
     command: serversocket

docker/Dockerfile

@@ -0,0 +1,9 @@
+FROM node:lts-alpine
+
+COPY svr /tlrtcfile/svr
+
+WORKDIR /tlrtcfile/svr
+
+RUN npm install --registry=https://registry.npmmirror.com && npm run build:pro
+
+ENTRYPOINT ["node"]

docker/docker-compose-build-code.yml

@@ -0,0 +1,45 @@
+version: '3'
+services:
+  tl-rtc-file-api-local:
+    profiles: ['local']
+    env_file:
+    - local.env
+    build: 
+      context: ../
+      dockerfile: ./Dockerfile
+    ports:
+    - 9092:9092
+    command: localapi
+
+  tl-rtc-file-socket-local:
+    profiles: ['local']
+    env_file:
+    - local.env
+    build: 
+      context: ../
+      dockerfile: ./Dockerfile
+    ports:
+    - 8444:8444
+    command: localsocket
+
+  tl-rtc-file-api-server:
+    profiles: ['server']
+    env_file:
+    - server.env
+    build: 
+      context: ../
+      dockerfile: ./Dockerfile
+    ports:
+    - 9092:9092
+    command: serverapi
+
+  tl-rtc-file-socket-server:
+    profiles: ['server']
+    env_file:
+    - server.env
+    build: 
+      context: ../
+      dockerfile: ./Dockerfile
+    ports:
+    - 8444:8444
+    command: serversocket