add uid/gid selection to run application as in Dockerfile

Reviewed-on: #40

Dockerfile

@@ -61,12 +61,6 @@ RUN mkdir -p ${DATA_PATH}/CustomizablePlayerModels && \
     ln -sf ${DATA_PATH}/CustomizablePlayerModels/ \
         ${CONFIG_PATH}/plugins/CustomizablePlayerModels
 
-# 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
-
 # Add symlinks to BlueMap files
 RUN mkdir -p ${DATA_PATH}/BlueMap/maps && \
     mkdir -p ${DATA_PATH}/BlueMap/logs && \
@@ -86,13 +80,23 @@ RUN mkdir -p ${DATA_PATH}/Chunky/tasks && \
 # Generate unicode locale so that cyrillic characters display properly
 RUN apt-get update -y && apt-get install -y locales && \
     echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \
-    dpkg-reconfigure --frontend=noninteractive locales
+    dpkg-reconfigure --frontend=noninteractive locales && \
+    rm -Rf var/lib/apt/lists/*
 ENV LANG en_US.UTF-8
 
 
 VOLUME ${DATA_PATH}
 
 
+# Minecraft
+EXPOSE 25565/tcp
+# BlueMap
+EXPOSE 8100/tcp 
+
+
+ENV GID=988
+ENV UID=999
+
 ENV MEMORY=4G
 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
 
@@ -130,21 +134,23 @@ ENV GRIM_DB_PASSWORD=0000
 
 ENV DISCORDSRV_BOT_TOKEN=dummy-token
 
+ENV DISCORDSRV_DB_HOST=127.0.0.1
+ENV DISCORDSRV_DB_PORT=3306
+ENV DISCORDSRV_DB_NAME=discordsrv_db
+ENV DISCORDSRV_DB_USERNAME=discordsrv
+ENV DISCORDSRV_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
 
 WORKDIR ${WORKDIR_PATH}/config
 
-# Minecraft
-EXPOSE 25565/tcp
-# BlueMap
-EXPOSE 8100/tcp 
-
 CMD \
+    # Create and switch to user with desired UID and GID.
+    # All processes that create/change files in ${DATA_PATH}
+    # must be run under this user.
+    groupadd -g ${GID} worker && \
+    useradd -M -g ${GID} -u ${UID} worker && \
+    chmod -R o-rwx ${WORKDIR_PATH} && \
+
     # Add proxy secret
     sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \
 
@@ -189,5 +195,15 @@ CMD \
     # Add DiscordSRV bot token
     sed -i "s/_DISCORDSRV_BOT_TOKEN_/${DISCORDSRV_BOT_TOKEN}/g" plugins/DiscordSRV/config.yml && \
 
+    # Add database info to DiscordSRV config
+    sed -i "s/_DISCORDSRV_DB_HOST_/${DISCORDSRV_DB_HOST}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_PORT_/${DISCORDSRV_DB_PORT}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_NAME_/${DISCORDSRV_DB_NAME}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_USERNAME_/${DISCORDSRV_DB_USERNAME}/g" plugins/DiscordSRV/config.yml && \
+    sed -i "s/_DISCORDSRV_DB_PASSWORD_/${DISCORDSRV_DB_PASSWORD}/g" plugins/DiscordSRV/config.yml && \
+
+    # Change UID and GID of used files to desired values.
+    chown -R worker:worker ${WORKDIR_PATH} && \
+
     # Launch
-    java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui
+    su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui"

src/plugins/BMMarker/settings.json

@@ -1,5 +1,5 @@
 {
     "language": "en",
-    "maxUserSets": 1,
+    "maxUserSets": 100,
-    "maxUserMarker": 5
+    "maxUserMarker": 1000
-}
+}

src/plugins/CommandWhitelist/config.yml

@@ -74,4 +74,7 @@ groups:
     - searchender
     - searchenchant
     - searchcontainer
+    - bmarker
+    - bmarker-setup
+    - bmarker-setup-set
     subcommands: []

src/plugins/DiscordSRV/config.yml

@@ -39,10 +39,10 @@ DiscordInviteLink: "https://discord.gg/5ZnJD4yDBq"
 # Эти функции не полностью оптимизированы; Используйте на свой риск
 
 # JDBC (MySQL/MariaDB)
-Experiment_JdbcAccountLinkBackend: "jdbc:mysql://HOST:PORT/NAME?autoReconnect=true&useSSL=false"
+Experiment_JdbcAccountLinkBackend: "jdbc:mysql://_DISCORDSRV_DB_HOST_:_DISCORDSRV_DB_PORT_/_DISCORDSRV_DB_NAME_?autoReconnect=true&useSSL=false"
-Experiment_JdbcTablePrefix: ""
+Experiment_JdbcTablePrefix: "discordsrv"
-Experiment_JdbcUsername: ""
+Experiment_JdbcUsername: "_DISCORDSRV_DB_USERNAME_"
-Experiment_JdbcPassword: ""
+Experiment_JdbcPassword: "_DISCORDSRV_DB_PASSWORD_"
 
 # Webhook Delivery
 Experiment_WebhookChatMessageDelivery: false

src/plugins/LuckPerms/config.yml

@@ -404,7 +404,7 @@ auto-install-translations: true
 meta-formatting:
   prefix:
     format:
-      - highest_on_track_staff
+      - highest_on_track_roles
       - highest_on_track_clans
       
     duplicates: first-only