Compare commits

..

No commits in common. "a33799c886a33f3ca6f4705c02251aea2f9a62dc" and "cb3c1fef9657f8a924b49ee73a96a94df71c4f3b" have entirely different histories.

2 changed files with 5 additions and 20 deletions

View File

@ -57,20 +57,13 @@ RUN mkdir -p ${DATA_PATH}/FancyNpcs/logs && \
# 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 && \
rm -Rf var/lib/apt/lists/*
dpkg-reconfigure --frontend=noninteractive locales
ENV LANG en_US.UTF-8
VOLUME ${DATA_PATH}
EXPOSE 25565/tcp
ENV GID=988
ENV UID=999
ENV MEMORY=4G
ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
@ -91,14 +84,9 @@ ENV SKINSRESTORER_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config
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} && \
EXPOSE 25565/tcp
CMD \
# Add proxy secret
sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" config/paper-global.yml && \
@ -119,8 +107,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 && \
# Change UID and GID of used files to desired values.
chown -R worker:worker ${WORKDIR_PATH} && \
# Launch
su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui"
java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui

View File

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