From 5147ac48a2e154f73113d3c2d8eeb29775292b39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= Date: Fri, 5 Jan 2024 09:48:04 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96docker-compose?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .editorconfig | 17 ++++++++++++++++ Dockerfile | 6 +++--- docker-compose.yml | 49 ++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 61 insertions(+), 11 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..3ff9c1c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,17 @@ +root = true + +[*] +insert_final_newline = true +charset = utf-8 +trim_trailing_whitespace = true +indent_style = space +indent_size = 2 + +[*.md] +indent_size = 4 +trim_trailing_whitespace = false + +eclint_indent_style = unset + +[Dockerfile] +indent_size = 4 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 5fdcd56..fca9427 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,9 +18,9 @@ COPY install-wechat.sh install-wechat.sh RUN bash -c 'nohup /entrypoint.sh 2>&1 &' && \ sleep 10 && \ sudo chown app:app WeChatSetup.exe && \ - ./install-wechat.sh && \ - rm -rf WeChatSetup.exe && \ - rm -rf install-wechat.sh + ./install-wechat.sh && \ + rm -rf WeChatSetup.exe && \ + rm -rf install-wechat.sh # 下载wxhelper.dll ADD ${WXHELPER_URL} wxhelper.dll diff --git a/docker-compose.yml b/docker-compose.yml index 84330df..e6283c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,11 +1,44 @@ version: "3.3" services: - wxhelper-docker: - build: . - restart: unless-stopped - container_name: wxhelper-docker - tty: true - ports: - - 8080:8080 - - 19088:19088 + 39825-v2: + build: + context: . + dockerfile: Dockerfile + args: + - WECHAT_URL=https://github.com/tom-snow/wechat-windows-versions/releases/download/v3.9.8.25/WeChatSetup-3.9.8.25.exe + - WXHELPER_URL=https://github.com/ttttupup/wxhelper/releases/download/3.9.8.25-v2/wxhelper.dll + image: wxhelper-docker:3.9.8.25-v2 + container_name: wxhelper-docker + restart: unless-stopped + tty: true + ports: + - 8080:8080 + - 19088:19088 + + 39581-v11: + build: + context: . + dockerfile: Dockerfile + image: wxhelper-docker:3.9.5.81-v11 + container_name: wxhelper-docker + restart: unless-stopped + tty: true + ports: + - 8080:8080 + - 19088:19088 + + 39223-v9: + build: + context: . + dockerfile: Dockerfile + args: + - WECHAT_URL=https://github.com/tom-snow/wechat-windows-versions/releases/download/v3.9.2.23/WeChatSetup-3.9.2.23.exe + - WXHELPER_URL=https://github.com/ttttupup/wxhelper/releases/download/3.9.2.23-v9/wxhelper.dll + image: wxhelper-docker:3.9.2.23-v9 + container_name: wxhelper-docker + restart: unless-stopped + tty: true + ports: + - 8080:8080 + - 19088:19088