bebrashield/server-survival
6
0
Fork 0
Code Pull Requests Actions Releases Activity

Compare commits

base: bebrashield:develop
Branches Tags
bebrashield:develop
bebrashield:suggestion-76
bebrashield:bug-80
bebrashield:suggestion-81
bebrashield:main
bebrashield:feature-23
bebrashield:feature-42
bebrashield:feature-55
bebrashield:feature-32
bebrashield:feature-27
bebrashield:carbonchat-config
bebrashield:chunky
bebrashield:feature-63
bebrashield:fix-skinsrestorer-db
bebrashield:feature-46
bebrashield:disable-nether-end
bebrashield:feature-34
bebrashield:feature-62
bebrashield:feature-61
bebrashield:patpat
bebrashield:feature-40
bebrashield:feature-25
bebrashield:feature-24
bebrashield:feature-37
bebrashield:feature-22
bebrashield:feature-41
bebrashield:feature-28
bebrashield:feature-31
bebrashield:feature-29
bebrashield:feature-38
bebrashield:1.0.0
..
compare: bebrashield:suggestion-81
Branches Tags
bebrashield:develop
bebrashield:suggestion-76
bebrashield:bug-80
bebrashield:suggestion-81
bebrashield:main
bebrashield:feature-23
bebrashield:feature-42
bebrashield:feature-55
bebrashield:feature-32
bebrashield:feature-27
bebrashield:carbonchat-config
bebrashield:chunky
bebrashield:feature-63
bebrashield:fix-skinsrestorer-db
bebrashield:feature-46
bebrashield:disable-nether-end
bebrashield:feature-34
bebrashield:feature-62
bebrashield:feature-61
bebrashield:patpat
bebrashield:feature-40
bebrashield:feature-25
bebrashield:feature-24
bebrashield:feature-37
bebrashield:feature-22
bebrashield:feature-41
bebrashield:feature-28
bebrashield:feature-31
bebrashield:feature-29
bebrashield:feature-38
bebrashield:1.0.0

No commits in common. "develop" and "suggestion-81" have entirely different histories.
develop ... suggestion

1 changed files with 21 additions and 37 deletions
Show Stats Expand all files Collapse all files

58
Dockerfile
View File

@ -9,31 +9,29 @@ ADD ./src ${CONFIG_PATH}
RUN mkdir ${DATA_PATH} RUN mkdir ${DATA_PATH}
# Add symlinks to Minecraft Vanilla files # Add symlinks to Minecraft default files
RUN mkdir ${DATA_PATH}/Vanilla && \ RUN touch ${DATA_PATH}/banned-ips.json && \
touch ${DATA_PATH}/Vanilla/banned-ips.json && \ ln -sf ${DATA_PATH}/banned-ips.json ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/banned-ips.json ${CONFIG_PATH} && \ touch ${DATA_PATH}/banned-players.json && \
touch ${DATA_PATH}/Vanilla/banned-players.json && \ ln -sf ${DATA_PATH}/banned-players.json ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/banned-players.json ${CONFIG_PATH} && \ mkdir ${DATA_PATH}/logs && \
mkdir ${DATA_PATH}/Vanilla/logs && \ ln -sf ${DATA_PATH}/logs ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/logs ${CONFIG_PATH} && \ touch ${DATA_PATH}/ops.json && \
touch ${DATA_PATH}/Vanilla/ops.json && \ ln -sf ${DATA_PATH}/ops.json ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/ops.json ${CONFIG_PATH} && \ touch ${DATA_PATH}/usercache.json && \
touch ${DATA_PATH}/Vanilla/usercache.json && \ ln -sf ${DATA_PATH}/usercache.json ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/usercache.json ${CONFIG_PATH} && \ touch ${DATA_PATH}/whitelist.json && \
touch ${DATA_PATH}/Vanilla/whitelist.json && \ ln -sf ${DATA_PATH}/whitelist.json ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/whitelist.json ${CONFIG_PATH} && \ mkdir ${DATA_PATH}/world && \
mkdir ${DATA_PATH}/Vanilla/world && \ ln -sf ${DATA_PATH}/world ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/world ${CONFIG_PATH} && \ mkdir ${DATA_PATH}/world_nether && \
mkdir ${DATA_PATH}/Vanilla/world_nether && \ ln -sf ${DATA_PATH}/world_nether ${CONFIG_PATH} && \
ln -sf ${DATA_PATH}/Vanilla/world_nether ${CONFIG_PATH} && \ mkdir ${DATA_PATH}/world_the_end && \
mkdir ${DATA_PATH}/Vanilla/world_the_end && \ ln -sf ${DATA_PATH}/world_the_end ${CONFIG_PATH}
ln -sf ${DATA_PATH}/Vanilla/world_the_end ${CONFIG_PATH}
# Add symlinks to PlasmoVoice files # Add symlinks to PlasmoVoice files
RUN mkdir ${DATA_PATH}/PlasmoVoice && \ RUN touch ${DATA_PATH}/pv-voice_mutes.json && \
touch ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json && \ ln -sf ${DATA_PATH}/pv-voice_mutes.json \
ln -sf ${DATA_PATH}/PlasmoVoice/pv-voice_mutes.json \
${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json ${CONFIG_PATH}/plugins/PlasmoVoice/voice_mutes.json
# Add symlinks to SuperVanish files # Add symlinks to SuperVanish files
@ -146,20 +144,6 @@ ENV DISCORDSRV_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config WORKDIR ${WORKDIR_PATH}/config
CMD \ CMD \
# Remove after migrated
mkdir -p ${DATA_PATH}/Vanilla && \
if [ -e ${DATA_PATH}/banned-ips.json ]; then mv ${DATA_PATH}/banned-ips.json ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/banned-players.json ]; then mv ${DATA_PATH}/banned-players.json ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/logs ]; then mv ${DATA_PATH}/logs ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/ops.json ]; then mv ${DATA_PATH}/ops.json ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/usercache.json ]; then mv ${DATA_PATH}/usercache.json ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/whitelist.json ]; then mv ${DATA_PATH}/whitelist.json ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/world ]; then mv ${DATA_PATH}/world ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/world_nether ]; then mv ${DATA_PATH}/world_nether ${DATA_PATH}/Vanilla; fi && \
if [ -e ${DATA_PATH}/world_the_end ]; then mv ${DATA_PATH}/world_the_end ${DATA_PATH}/Vanilla; fi && \
mkdir -p ${DATA_PATH}/PlasmoVoice && \
if [ -e ${DATA_PATH}/pv-voice_mutes.json ]; then mv ${DATA_PATH}/pv-voice_mutes.json ${DATA_PATH}/PlasmoVoice; fi && \
# Create and switch to user with desired UID and GID. # Create and switch to user with desired UID and GID.
# All processes that create/change files in ${DATA_PATH} # All processes that create/change files in ${DATA_PATH}
# must be run under this user. # must be run under this user.