From 582f57060c5a27863123e2ba8743e814ed637d12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=8C=E4=BA=9A?= <130141407+ShiaBox@users.noreply.github.com> Date: Fri, 23 May 2025 18:59:50 +0800 Subject: [PATCH 1/4] update dice.yml olivos.yml sealdice.yml About dice & olivos : Docker images sourced from unofficial repositories. These are community-maintained images, please assess security risks before use. The sealdice image is the official build, but since no 'latest' tag is published, please refer to https://github.com/sealdice/sealdice-build/pkgs/container/sealdice when creating containers to check and update the image name. --- compose/dice.yml | 39 +++++++++++++++++++++++++++++++++++++++ compose/olivos.yml | 39 +++++++++++++++++++++++++++++++++++++++ compose/sealdice.yml | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 111 insertions(+) create mode 100644 compose/dice.yml create mode 100644 compose/olivos.yml create mode 100644 compose/sealdice.yml diff --git a/compose/dice.yml b/compose/dice.yml new file mode 100644 index 0000000..03103a1 --- /dev/null +++ b/compose/dice.yml @@ -0,0 +1,39 @@ +# docker-compose.yml +# ACCOUNT=123456 NAPCAT_UID=$(id -u) NAPCAT_GID=$(id -g) docker-compose -f ./compose/dice.yml up -d +services: + dice: + image: shiaworkshop/dice:latest + container_name: dice-main + stdin_open: true + tty: true + volumes: + - "./Dice:/app/Dice" + - "./napcat/config:/app/napcat/config" + environment: + - ACCOUNT=${ACCOUNT} + networks: + - dice_network + depends_on: + - napcat + + napcat: + image: mlikiowa/napcat-docker:latest + container_name: napcat + ports: + - "6099:6099" + volumes: + - "./napcat/config:/app/napcat/config" + - "./napcat/QQ_DATA:/app/.config/QQ" + - "./Dice:/app/Dice" + environment: + - NAPCAT_UID=${NAPCAT_UID:-1000} + - NAPCAT_GID=${NAPCAT_GID:-1000} + - ACCOUNT=${ACCOUNT} + - MODE=dice + networks: + - dice_network + mac_address: "02:42:ac:11:00:02" + +networks: + dice_network: + driver: bridge \ No newline at end of file diff --git a/compose/olivos.yml b/compose/olivos.yml new file mode 100644 index 0000000..f6fecf0 --- /dev/null +++ b/compose/olivos.yml @@ -0,0 +1,39 @@ +# docker-compose.yml +# ACCOUNT=123456 NAPCAT_UID=$(id -u) NAPCAT_GID=$(id -g) docker-compose -f ./compose/olivos.yml up -d +services: + olivos-app: + image: shiaworkshop/olivos:latest + container_name: olivos-main + stdin_open: true + tty: true + volumes: + - "./OlivOS:/app/OlivOS" + - "./napcat/config:/app/napcat/config" + environment: + - LOGIN_UIN=${ACCOUNT} + networks: + - olivos_network + depends_on: + - napcat + + napcat: + image: mlikiowa/napcat-docker:latest + container_name: napcat + ports: + - "6099:6099" + volumes: + - "./napcat/config:/app/napcat/config" + - "./napcat/QQ_DATA:/app/.config/QQ" + - "./OlivOS:/app/OlivOS" + environment: + - NAPCAT_UID=${NAPCAT_UID:-1000} + - NAPCAT_GID=${NAPCAT_GID:-1000} + - ACCOUNT=${ACCOUNT} + - MODE=olivos + networks: + - olivos_network + mac_address: "02:42:ac:11:00:02" + +networks: + olivos_network: + driver: bridge \ No newline at end of file diff --git a/compose/sealdice.yml b/compose/sealdice.yml new file mode 100644 index 0000000..1dab4d2 --- /dev/null +++ b/compose/sealdice.yml @@ -0,0 +1,33 @@ +# docker-compose.yml +# NAPCAT_UID=$(id -u) NAPCAT_GID=$(id -g) docker-compose -f ./compose/sealdice.yml up -d +services: + sealdice: + image: ghcr.io/sealdice/sealdice:sha-2428978 + container_name: sealdice + volumes: + - "./sealdice:/app/sealdice" + networks: + - sealdice_network + depends_on: + - napcat + + napcat: + image: mlikiowa/napcat-docker:latest + container_name: napcat + ports: + - "6099:6099" + volumes: + - "./napcat/config:/app/napcat/config" + - "./napcat/QQ_DATA:/app/.config/QQ" + - "./sealdice:/app/sealdice" + environment: + - NAPCAT_UID=${NAPCAT_UID:-1000} + - NAPCAT_GID=${NAPCAT_GID:-1000} + - MODE=sealdice + networks: + - sealdice_network + mac_address: "02:42:ac:11:00:02" + +networks: + sealdice_network: + driver: bridge \ No newline at end of file From 3600a9fd0cb4cc8487727d7ed27be260e59271db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=8C=E4=BA=9A?= <130141407+ShiaBox@users.noreply.github.com> Date: Fri, 23 May 2025 19:08:28 +0800 Subject: [PATCH 2/4] fix sealdice.yml --- compose/sealdice.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/compose/sealdice.yml b/compose/sealdice.yml index 1dab4d2..ff69b20 100644 --- a/compose/sealdice.yml +++ b/compose/sealdice.yml @@ -5,7 +5,8 @@ services: image: ghcr.io/sealdice/sealdice:sha-2428978 container_name: sealdice volumes: - - "./sealdice:/app/sealdice" + - "./data:/data" + - "./backups:/backups" networks: - sealdice_network depends_on: @@ -19,7 +20,8 @@ services: volumes: - "./napcat/config:/app/napcat/config" - "./napcat/QQ_DATA:/app/.config/QQ" - - "./sealdice:/app/sealdice" + - "./data:/data" + - "./backups:/backups" environment: - NAPCAT_UID=${NAPCAT_UID:-1000} - NAPCAT_GID=${NAPCAT_GID:-1000} From 3383b815b559cae0218c5c45e79902e9f6c318b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=8C=E4=BA=9A?= <130141407+ShiaBox@users.noreply.github.com> Date: Fri, 23 May 2025 19:10:22 +0800 Subject: [PATCH 3/4] fix sealdice.yml --- compose/sealdice.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compose/sealdice.yml b/compose/sealdice.yml index ff69b20..e0f2788 100644 --- a/compose/sealdice.yml +++ b/compose/sealdice.yml @@ -4,6 +4,8 @@ services: sealdice: image: ghcr.io/sealdice/sealdice:sha-2428978 container_name: sealdice + ports: + - "3211:3211" volumes: - "./data:/data" - "./backups:/backups" From 6c723f5d3192e4c1df2a9cfcbfbde26d9c915588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=8C=E4=BA=9A?= <130141407+ShiaBox@users.noreply.github.com> Date: Fri, 23 May 2025 19:46:11 +0800 Subject: [PATCH 4/4] update templates --- templates/templates/dice.json | 26 +++++++++++++++++++++++ templates/templates/olivos.json | 35 +++++++++++++++++++++++++++++++ templates/templates/sealdice.json | 26 +++++++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 templates/templates/dice.json create mode 100644 templates/templates/olivos.json create mode 100644 templates/templates/sealdice.json diff --git a/templates/templates/dice.json b/templates/templates/dice.json new file mode 100644 index 0000000..c80b599 --- /dev/null +++ b/templates/templates/dice.json @@ -0,0 +1,26 @@ +{ + "network": { + "httpServers": [], + "httpSseServers": [], + "httpClients": [], + "websocketServers": [ + { + "enable": true, + "name": "dice", + "host": "0.0.0.0", + "port": 15801, + "reportSelfMessage": false, + "enableForcePushEvent": true, + "messagePostFormat": "array", + "token": "", + "debug": false, + "heartInterval": 30000 + } + ], + "websocketClients": [], + "plugins": [] +}, + "musicSignUrl": "", + "enableLocalFile2Url": false, + "parseMultMsg": false +} \ No newline at end of file diff --git a/templates/templates/olivos.json b/templates/templates/olivos.json new file mode 100644 index 0000000..1ab2f23 --- /dev/null +++ b/templates/templates/olivos.json @@ -0,0 +1,35 @@ +{ + "network": { + "httpServers": [ + { + "enable": true, + "name": "olivos-http-server", + "host": "0.0.0.0", + "port": 5700, + "enableCors": true, + "enableWebsocket": true, + "messagePostFormat": "string", + "token": "7777777", + "debug": false + } + ], + "httpSseServers": [], + "httpClients": [ + { + "enable": true, + "name": "olivos-http-client", + "url": "http://olivos-app:55001/OlivOSMsgApi/qq/onebot/default", + "reportSelfMessage": false, + "messagePostFormat": "string", + "token": "7777777", + "debug": false + } + ], + "websocketServers": [], + "websocketClients": [], + "plugins": [] + }, + "musicSignUrl": "", + "enableLocalFile2Url": false, + "parseMultMsg": false +} \ No newline at end of file diff --git a/templates/templates/sealdice.json b/templates/templates/sealdice.json new file mode 100644 index 0000000..42ef68d --- /dev/null +++ b/templates/templates/sealdice.json @@ -0,0 +1,26 @@ +{ + "network": { + "httpServers": [], + "httpSseServers": [], + "httpClients": [], + "websocketServers": [ + { + "enable": true, + "name": "sealdice", + "host": "0.0.0.0", + "port": 1234, + "reportSelfMessage": false, + "enableForcePushEvent": true, + "messagePostFormat": "array", + "token": "", + "debug": false, + "heartInterval": 30000 + } + ], + "websocketClients": [], + "plugins": [] + }, + "musicSignUrl": "", + "enableLocalFile2Url": false, + "parseMultMsg": false + } \ No newline at end of file