Compare commits
8 Commits
feature-23
...
develop
Author | SHA1 | Date | |
---|---|---|---|
004eed8a14 | |||
1adfac3553 | |||
8f61726fce | |||
06a287c15e | |||
a1c39eeda7 | |||
a33799c886 | |||
9f66b6701e | |||
aaff9eb3e2 |
7
.github/workflows/build-docker.yml
vendored
7
.github/workflows/build-docker.yml
vendored
@ -5,6 +5,8 @@ on:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
tags:
|
||||
- '[0-9]+.[0-9]+.[0-9]+'
|
||||
|
||||
jobs:
|
||||
build-docker:
|
||||
@ -42,5 +44,6 @@ jobs:
|
||||
push: true
|
||||
# TODO: split tag names into multiple lines
|
||||
tags: |
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:${{github.sha}}
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}/${{github.ref_name}}:latest
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.sha}}
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:${{github.ref_name}}
|
||||
${{env.registry}}/${{github.repository_owner}}/${{github.event.repository.name}}:latest
|
||||
|
23
Dockerfile
23
Dockerfile
@ -57,13 +57,20 @@ 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
|
||||
dpkg-reconfigure --frontend=noninteractive locales && \
|
||||
rm -Rf var/lib/apt/lists/*
|
||||
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
|
||||
|
||||
@ -84,9 +91,14 @@ ENV SKINSRESTORER_DB_PASSWORD=0000
|
||||
|
||||
WORKDIR ${WORKDIR_PATH}/config
|
||||
|
||||
EXPOSE 25565/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 && \
|
||||
|
||||
@ -107,5 +119,8 @@ 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
|
||||
java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui
|
||||
su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -jar *.jar -nogui"
|
||||
|
@ -53,7 +53,7 @@ holograms:
|
||||
shadow_strength: 1.0
|
||||
billboard: fixed
|
||||
text:
|
||||
- <color:#6558F4>discord.gg/xsyy7d8RfG</color>
|
||||
- <color:#6558F4>discord.gg/5ZnJD4yDBq</color>
|
||||
- <gray>Клик</gray>
|
||||
text_shadow: false
|
||||
see_through: false
|
||||
|
@ -69,8 +69,8 @@ npcs:
|
||||
value: minecraft:entity.experience_orb.pickup
|
||||
'2':
|
||||
action: message
|
||||
value: <click:OPEN_URL:https://discord.gg/xsyy7d8RfG><color:#6558F4><bold>Discord:</bold></color>
|
||||
<grey>https://discord.gg/xsyy7d8RfG</grey></click>
|
||||
value: <click:OPEN_URL:https://discord.gg/5ZnJD4yDBq><color:#6558F4><bold>Discord:</bold></color>
|
||||
<grey>https://discord.gg/5ZnJD4yDBq</grey></click>
|
||||
26dee80c-9004-47c6-bbc0-343fe2f2fba7:
|
||||
name: link_bebrashield_site
|
||||
creator: 3ce31233-217d-3258-8b5e-1f458c4f8e9d
|
||||
|
@ -25,13 +25,13 @@ items:
|
||||
name: "<color:#6558F4><bold>Discord</bold></color>"
|
||||
lore:
|
||||
- "<grey>Кликните, чтобы получить ссылку в чате.</grey>"
|
||||
- "<grey>https://discord.gg/xsyy7d8RfG</grey>"
|
||||
- "<grey>https://discord.gg/5ZnJD4yDBq</grey>"
|
||||
actions:
|
||||
- type: sound
|
||||
sound: ENTITY_EXPERIENCE_ORB_PICKUP
|
||||
- type: message
|
||||
messages:
|
||||
- "<click:OPEN_URL:https://discord.gg/xsyy7d8RfG><color:#6558F4><bold>Discord:</bold></color> <grey>https://discord.gg/xsyy7d8RfG</grey></click>"
|
||||
- "<click:OPEN_URL:https://discord.gg/5ZnJD4yDBq><color:#6558F4><bold>Discord:</bold></color> <grey>https://discord.gg/5ZnJD4yDBq</grey></click>"
|
||||
- type: close
|
||||
|
||||
telegram:
|
||||
|
Loading…
Reference in New Issue
Block a user