From fdca7e00dae65eb455f57204d423a3946ea954f7 Mon Sep 17 00:00:00 2001 From: "https://blog.iamtsm.cn" <1905333456@qq.com> Date: Sat, 5 Aug 2023 16:15:40 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A5=E5=85=85=E9=83=A8=E7=BD=B2?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 19 +++++++++++++++++++ bin/auto-publish-local-to-hub.sh | 12 ++++++++++++ bin/auto-publish-server-to-hub.sh | 12 ++++++++++++ .../linux/auto-check-install-local.sh | 0 .../linux/auto-check-install-server.sh | 0 bin/linux/auto-start-docker-local.sh | 1 + bin/linux/auto-start-docker-server.sh | 1 + {svr/bin => bin}/linux/auto-start-local.sh | 0 {svr/bin => bin}/linux/auto-start-server.sh | 0 {svr/bin => bin}/linux/auto-stop.sh | 0 .../windows/auto-check-install-local.bat | 0 .../windows/auto-check-install-server.bat | 0 {svr/bin => bin}/windows/auto-start-local.bat | 0 .../bin => bin}/windows/auto-start-server.bat | 0 svr/conf/cfg.json | 2 +- 15 files changed, 46 insertions(+), 1 deletion(-) create mode 100755 bin/auto-publish-local-to-hub.sh create mode 100755 bin/auto-publish-server-to-hub.sh rename {svr/bin => bin}/linux/auto-check-install-local.sh (100%) rename {svr/bin => bin}/linux/auto-check-install-server.sh (100%) create mode 100644 bin/linux/auto-start-docker-local.sh create mode 100644 bin/linux/auto-start-docker-server.sh rename {svr/bin => bin}/linux/auto-start-local.sh (100%) rename {svr/bin => bin}/linux/auto-start-server.sh (100%) rename {svr/bin => bin}/linux/auto-stop.sh (100%) rename {svr/bin => bin}/windows/auto-check-install-local.bat (100%) rename {svr/bin => bin}/windows/auto-check-install-server.bat (100%) rename {svr/bin => bin}/windows/auto-start-local.bat (100%) rename {svr/bin => bin}/windows/auto-start-server.bat (100%) diff --git a/README.md b/README.md index 9d6458c..5030fb7 100644 --- a/README.md +++ b/README.md @@ -221,10 +221,29 @@ normal : 正常通知, error : 系统报错通知 ### 使用官方镜像 : +两种镜像模式选一种即可 + +http模式镜像: + docker pull iamtsm/tl-rtc-file-api-local + docker run --name=api-local -p 9092:9092 -e "WS_HOST=ws://127.0.0.1:8444" -d iamtsm/tl-rtc-file-api-local localapi + docker pull iamtsm/tl-rtc-file-socket-local + docker run --name=socket-local -p 8444:8444 -e "WS_HOST=ws://127.0.0.1:8444" -d iamtsm/tl-rtc-file-sockrt-local localsocket + +https模式镜像: + + docker pull iamtsm/tl-rtc-file-api-server + + docker run --name=api-server -p 9092:9092 -e "WSS_HOST=wss://127.0.0.1:8444" -d iamtsm/tl-rtc-file-api-server serverapi + + docker pull iamtsm/tl-rtc-file-socket-server + + docker run --name=socket-server -p 8444:8444 -e "WSS_HOST=wss://127.0.0.1:8444" -d iamtsm/tl-rtc-file-sockrt-server serversocket + + ### 自己打包镜像 : 两种模式选一种操作即可 diff --git a/bin/auto-publish-local-to-hub.sh b/bin/auto-publish-local-to-hub.sh new file mode 100755 index 0000000..00d00ab --- /dev/null +++ b/bin/auto-publish-local-to-hub.sh @@ -0,0 +1,12 @@ +docker-compose --profile=local build + +docker tag tl-rtc-file-git-api-local:latest iamtsm/tl-rtc-file-api-local +docker tag tl-rtc-file-git-socket-local:latest iamtsm/tl-rtc-file-socket-local + +docker push iamtsm/tl-rtc-file-api-local +docker push iamtsm/tl-rtc-file-socket-local + +docker rmi tl-rtc-file-git-api-local +docker rmi tl-rtc-file-git-socket-local +docker rmi iamtsm/tl-rtc-file-api-local +docker rmi iamtsm/tl-rtc-file-socket-local \ No newline at end of file diff --git a/bin/auto-publish-server-to-hub.sh b/bin/auto-publish-server-to-hub.sh new file mode 100755 index 0000000..fffe97b --- /dev/null +++ b/bin/auto-publish-server-to-hub.sh @@ -0,0 +1,12 @@ +docker-compose --profile=server build + +docker tag tl-rtc-file-git-api-server:latest iamtsm/tl-rtc-file-api-server +docker tag tl-rtc-file-git-socket-server:latest iamtsm/tl-rtc-file-socket-server + +docker push iamtsm/tl-rtc-file-api-server +docker push iamtsm/tl-rtc-file-socket-server + +docker rmi tl-rtc-file-git-api-server +docker rmi tl-rtc-file-git-socket-server +docker rmi iamtsm/tl-rtc-file-api-server +docker rmi iamtsm/tl-rtc-file-socket-server \ No newline at end of file diff --git a/svr/bin/linux/auto-check-install-local.sh b/bin/linux/auto-check-install-local.sh similarity index 100% rename from svr/bin/linux/auto-check-install-local.sh rename to bin/linux/auto-check-install-local.sh diff --git a/svr/bin/linux/auto-check-install-server.sh b/bin/linux/auto-check-install-server.sh similarity index 100% rename from svr/bin/linux/auto-check-install-server.sh rename to bin/linux/auto-check-install-server.sh diff --git a/bin/linux/auto-start-docker-local.sh b/bin/linux/auto-start-docker-local.sh new file mode 100644 index 0000000..dab35b8 --- /dev/null +++ b/bin/linux/auto-start-docker-local.sh @@ -0,0 +1 @@ +docker-compose --profile=local up -d \ No newline at end of file diff --git a/bin/linux/auto-start-docker-server.sh b/bin/linux/auto-start-docker-server.sh new file mode 100644 index 0000000..8641a57 --- /dev/null +++ b/bin/linux/auto-start-docker-server.sh @@ -0,0 +1 @@ +docker-compose --profile=server up -d \ No newline at end of file diff --git a/svr/bin/linux/auto-start-local.sh b/bin/linux/auto-start-local.sh similarity index 100% rename from svr/bin/linux/auto-start-local.sh rename to bin/linux/auto-start-local.sh diff --git a/svr/bin/linux/auto-start-server.sh b/bin/linux/auto-start-server.sh similarity index 100% rename from svr/bin/linux/auto-start-server.sh rename to bin/linux/auto-start-server.sh diff --git a/svr/bin/linux/auto-stop.sh b/bin/linux/auto-stop.sh similarity index 100% rename from svr/bin/linux/auto-stop.sh rename to bin/linux/auto-stop.sh diff --git a/svr/bin/windows/auto-check-install-local.bat b/bin/windows/auto-check-install-local.bat similarity index 100% rename from svr/bin/windows/auto-check-install-local.bat rename to bin/windows/auto-check-install-local.bat diff --git a/svr/bin/windows/auto-check-install-server.bat b/bin/windows/auto-check-install-server.bat similarity index 100% rename from svr/bin/windows/auto-check-install-server.bat rename to bin/windows/auto-check-install-server.bat diff --git a/svr/bin/windows/auto-start-local.bat b/bin/windows/auto-start-local.bat similarity index 100% rename from svr/bin/windows/auto-start-local.bat rename to bin/windows/auto-start-local.bat diff --git a/svr/bin/windows/auto-start-server.bat b/bin/windows/auto-start-server.bat similarity index 100% rename from svr/bin/windows/auto-start-server.bat rename to bin/windows/auto-start-server.bat diff --git a/svr/conf/cfg.json b/svr/conf/cfg.json index 946d92a..8d61d43 100644 --- a/svr/conf/cfg.json +++ b/svr/conf/cfg.json @@ -1,5 +1,5 @@ { - "version": "10.2.9", + "version": "10.3.0", "ws": { "port": 8444, "host": "ws://127.0.0.1:8444"