From 30bfc85b820198e0a35cc0ffb8b1485ccd426ae1 Mon Sep 17 00:00:00 2001 From: Oznobys Date: Sun, 3 Aug 2025 10:13:13 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20DiscordSRV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 1 - .gitignore | 1 - 2 files changed, 2 deletions(-) diff --git a/.dockerignore b/.dockerignore index 4c1d8ac..f253cfb 100644 --- a/.dockerignore +++ b/.dockerignore @@ -39,7 +39,6 @@ src/plugins/FancyNpcs/logs src/plugins/ImageFrame/upload src/map-color-cache.dat -src/plugins/DiscordSRV/accounts.aof src/plugins/WorldGuard/cache wepif.yml diff --git a/.gitignore b/.gitignore index 4c1d8ac..f253cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ src/plugins/FancyNpcs/logs src/plugins/ImageFrame/upload src/map-color-cache.dat -src/plugins/DiscordSRV/accounts.aof src/plugins/WorldGuard/cache wepif.yml From 20198e23774d2280aaa18e92c9d6b1536a9240bb Mon Sep 17 00:00:00 2001 From: Oznobys Date: Sun, 3 Aug 2025 10:20:21 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20DiscordSRV?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .dockerignore | 1 - .gitignore | 1 - Dockerfile | 5 ----- 3 files changed, 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index f253cfb..f24a0a5 100644 --- a/.dockerignore +++ b/.dockerignore @@ -39,7 +39,6 @@ src/plugins/FancyNpcs/logs src/plugins/ImageFrame/upload src/map-color-cache.dat - src/plugins/WorldGuard/cache wepif.yml diff --git a/.gitignore b/.gitignore index f253cfb..f24a0a5 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,6 @@ src/plugins/FancyNpcs/logs src/plugins/ImageFrame/upload src/map-color-cache.dat - src/plugins/WorldGuard/cache wepif.yml diff --git a/Dockerfile b/Dockerfile index f035536..7d07be1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,11 +54,6 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \ ln -sf ${DATA_PATH}/FancyNpcs/logs/ \ ${CONFIG_PATH}/plugins/FancyNpcs/logs -# Add symlinks to DiscordSRV files -RUN mkdir -p ${DATA_PATH}/DiscordSRV && \ - touch ${DATA_PATH}/DiscordSRV/accounts.aof && \ - ln -sf ${DATA_PATH}/DiscordSRV/accounts.aof \ - ${CONFIG_PATH}/plugins/DiscordSRV/accounts.aof VOLUME ${DATA_PATH} From 3c2f06b7e7ae69eabce638fd17406d75f5182dc4 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 3 Aug 2025 23:09:14 +0300 Subject: [PATCH 3/4] fix Dockerfile formatting --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d07be1..dea8d4f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,7 +55,6 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \ ${CONFIG_PATH}/plugins/FancyNpcs/logs - VOLUME ${DATA_PATH} From e5a319e74dccb4282ea9cade8f32b17644109a65 Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Sun, 3 Aug 2025 23:12:49 +0300 Subject: [PATCH 4/4] remove discordsrv bot token env and substitution command form Dockerfile --- Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index dea8d4f..a2592e0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,8 +75,6 @@ ENV SKINSRESTORER_DB_NAME=skinsrestorer_db ENV SKINSRESTORER_DB_USERNAME=skinsrestorer ENV SKINSRESTORER_DB_PASSWORD=0000 -ENV DISCORDSRV_BOT_TOKEN=token - WORKDIR ${WORKDIR_PATH}/config @@ -103,8 +101,5 @@ CMD \ sed -i "s/_SKINSRESTORER_DB_USERNAME_/${SKINSRESTORER_DB_USERNAME}/g" plugins/SkinsRestorer/config.yml && \ sed -i "s/_SKINSRESTORER_DB_PASSWORD_/${SKINSRESTORER_DB_PASSWORD}/g" plugins/SkinsRestorer/config.yml && \ - # Add DiscordSRV secrets - sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \ - # Launch java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui