From f1ba8bb55271f9675b035b09a38151e41a4a721f Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Tue, 22 Jul 2025 22:14:58 +0300 Subject: [PATCH] add LibertyBans secret substitution --- .dockerignore | 1 - .gitignore | 1 - Dockerfile | 27 ++++++++++++++++++++++----- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/.dockerignore b/.dockerignore index c1689e1..80f5636 100644 --- a/.dockerignore +++ b/.dockerignore @@ -28,5 +28,4 @@ src/plugins/DiscordSRV/accounts.aof .crowdin src/plugins/PlasmoVoice/voice_mutes.json - src/plugins/LibertyBans/internal diff --git a/.gitignore b/.gitignore index df97e77..c539ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -28,5 +28,4 @@ src/plugins/DiscordSRV/accounts.aof .crowdin src/plugins/PlasmoVoice/voice_mutes.json - src/plugins/LibertyBans/internal diff --git a/Dockerfile b/Dockerfile index cfd466e..f780e3e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,6 +9,7 @@ ADD ./src ${CONFIG_PATH} RUN mkdir ${DATA_PATH} +# Add symlinks to Default Minecraft files RUN touch ${DATA_PATH}/banned-ips.json && \ ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH} RUN touch ${DATA_PATH}/banned-players.json && \ @@ -27,6 +28,8 @@ RUN mkdir ${DATA_PATH}/world_nether && \ ln -sf ${DATA_PATH}/world_nether ${CONFIG_PATH} RUN mkdir ${DATA_PATH}/world_the_end && \ ln -sf ${DATA_PATH}/world_the_end ${CONFIG_PATH} + +# Add symlinks to Plasmo Voice files RUN touch ${DATA_PATH}/pv-voice_mutes.json && \ ln -sf ${DATA_PATH}/pv-voice_mutes.json \ ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json @@ -39,17 +42,24 @@ ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000 ENV VOICE_SECRET=00000000-0000-0000-0000-000000000000 +ENV LUCKPERMS_DB_HOST=127.0.0.1 +ENV LUCKPERMS_DB_PORT=3306 +ENV LUCKPERMS_DB_NAME=luckperms_db +ENV LUCKPERMS_DB_USERNAME=luckperms +ENV LUCKPERMS_DB_PASSWORD=0000 + ENV COREPROTECT_DB_HOST=127.0.0.1 ENV COREPROTECT_DB_PORT=3306 ENV COREPROTECT_DB_NAME=coreprotect_db ENV COREPROTECT_DB_USERNAME=coreprotect ENV COREPROTECT_DB_PASSWORD=0000 -ENV LUCKPERMS_DB_HOST=127.0.0.1 -ENV LUCKPERMS_DB_PORT=3306 -ENV LUCKPERMS_DB_NAME=luckperms -ENV LUCKPERMS_DB_USERNAME=luckperms -ENV LUCKPERMS_DB_PASSWORD=0000 +ENV LIBERTYBANS_DB_HOST=127.0.0.1 +ENV LIBERTYBANS_DB_PORT=3306 +ENV LIBERTYBANS_DB_NAME=libertybans_db +ENV LIBERTYBANS_DB_USERNAME=libertybans +ENV LIBERTYBANS_DB_PASSWORD=0000 + WORKDIR ${WORKDIR_PATH}/config @@ -76,5 +86,12 @@ CMD \ sed -i "s/_COREPROTECT_DB_USERNAME_/${COREPROTECT_DB_USERNAME}/g" plugins/CoreProtect/config.yml && \ sed -i "s/_COREPROTECT_DB_PASSWORD_/${COREPROTECT_DB_PASSWORD}/g" plugins/CoreProtect/config.yml && \ + # Add libertybans database secrets + sed -i "s/_LIBERTYBANS_DB_HOST_/${LIBERTYBANS_DB_HOST}/g" plugins/LibertyBans/sql.yml && \ + sed -i "s/_LIBERTYBANS_DB_PORT_/${LIBERTYBANS_DB_PORT}/g" plugins/LibertyBans/sql.yml && \ + sed -i "s/_LIBERTYBANS_DB_NAME_/${LIBERTYBANS_DB_NAME}/g" plugins/LibertyBans/sql.yml && \ + sed -i "s/_LIBERTYBANS_DB_USERNAME_/${LIBERTYBANS_DB_USERNAME}/g" plugins/LibertyBans/sql.yml && \ + sed -i "s/_LIBERTYBANS_DB_PASSWORD_/${LIBERTYBANS_DB_PASSWORD}/g" plugins/LibertyBans/sql.yml && \ + # Launch java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui