Compare commits

...

11 Commits

Author SHA1 Message Date
625d8a2a7a
add uid/gid selection to run application as in Dockerfile 2025-08-12 19:11:52 +03:00
87bd681c23
rearranged Dockerfile statements and add remove cache after locale installation 2025-08-12 18:51:42 +03:00
b4ab1f1860 Merge pull request 'feature-26-transparent-favicon-background' (#21) from feature-26 into develop
All checks were successful
/ build-docker (push) Successful in 8m49s
Reviewed-on: #21
2025-08-10 17:52:01 +00:00
43a34ffd75
remove favicon background 2025-08-10 20:50:16 +03:00
f50ea15354 Merge pull request 'feature-23-permission-improvements' (#20) from feature-23 into develop
Some checks failed
/ build-docker (push) Has been cancelled
Reviewed-on: #20
2025-08-10 17:48:01 +00:00
e9a975996d
add bmmarker permissions to admin role 2025-08-10 20:45:03 +03:00
e0e65dfae1
remove open ender chest permission from moderator role
due to the bug in the used plugin version (5.1.2), ender chest not displaying contents properly in view-only mode

fixed in 5.1.6 https://github.com/Jikoo/OpenInv/releases/tag/5.1.6
2025-08-10 20:43:34 +03:00
fe9c92e558
rename track "staff" to "roles" 2025-08-10 20:43:34 +03:00
62675bf7aa
add "eye" clan 2025-08-10 20:43:34 +03:00
f9a03bc26c
fix players' inability to set skins by url 2025-08-10 20:43:34 +03:00
86282257f5 Merge pull request 'feature-42-fix-unicode' (#19) from feature-42 into develop
All checks were successful
/ build-docker (push) Successful in 9m21s
Reviewed-on: #19
2025-08-06 18:57:22 +00:00
4 changed files with 53 additions and 15 deletions

View File

@ -18,13 +18,20 @@ RUN touch ${DATA_PATH}/pv-groups.json && \
# Generate unicode locale so that cyrillic characters display properly # Generate unicode locale so that cyrillic characters display properly
RUN apt-get update -y && apt-get install -y locales && \ RUN apt-get update -y && apt-get install -y locales && \
echo en_US.UTF-8 UTF-8 > /etc/locale.gen && \ 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 ENV LANG en_US.UTF-8
VOLUME ${DATA_PATH} VOLUME ${DATA_PATH}
EXPOSE 25565/tcp
ENV GID=988
ENV UID=999
ENV MEMORY=4G ENV MEMORY=4G
ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000 ENV PROXY_SECRET=00000000-0000-0000-0000-000000000000
@ -60,13 +67,19 @@ ENV SONAR_DB_NAME=sonar_db
ENV SONAR_DB_USERNAME=sonar ENV SONAR_DB_USERNAME=sonar
ENV SONAR_DB_PASSWORD=0000 ENV SONAR_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config
EXPOSE 25565/tcp WORKDIR ${WORKDIR_PATH}/config
# TODO: Make awk commands sapn multiple lines # TODO: Make awk commands sapn multiple lines
# TODO: Use one call to awk to perform substitutions # TODO: Use one call to awk to perform substitutions
CMD \ 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 # Add proxy secret
sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" forwarding.secret && \ sed -i "s/_PROXY_SECRET_/${PROXY_SECRET}/g" forwarding.secret && \
@ -115,4 +128,7 @@ CMD \
sed -i "s/_SONAR_DB_USERNAME_/${SONAR_DB_USERNAME}/g" plugins/sonar/config.yml && \ sed -i "s/_SONAR_DB_USERNAME_/${SONAR_DB_USERNAME}/g" plugins/sonar/config.yml && \
sed -i "s/_SONAR_DB_PASSWORD_/${SONAR_DB_PASSWORD}/g" plugins/sonar/config.yml && \ sed -i "s/_SONAR_DB_PASSWORD_/${SONAR_DB_PASSWORD}/g" plugins/sonar/config.yml && \
java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar # Change UID and GID of used files to desired values.
chown -R worker:worker ${WORKDIR_PATH} && \
su worker -c "java -Xms${MEMORY} -Xmx${MEMORY} -XX:+UseG1GC -XX:G1HeapRegionSize=4M -XX:+UnlockExperimentalVMOptions -XX:+ParallelRefProcEnabled -XX:+AlwaysPreTouch -XX:MaxInlineLevel=15 -jar *.jar"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 517 KiB

After

Width:  |  Height:  |  Size: 539 KiB

View File

@ -403,7 +403,7 @@ auto-install-translations: true
meta-formatting: meta-formatting:
prefix: prefix:
format: format:
- highest_on_track_staff - highest_on_track_roles
- highest_on_track_clans - highest_on_track_clans
duplicates: first-only duplicates: first-only
start-spacer: "<dark_grey>[</dark_grey>" start-spacer: "<dark_grey>[</dark_grey>"

View File

@ -6,6 +6,22 @@
"groups": { "groups": {
"role_admin": { "role_admin": {
"nodes": [ "nodes": [
{
"type": "permission",
"key": "bmarker.command.markers",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "bmarker.command.sets",
"value": true,
"context": {
"server": "survival"
}
},
{ {
"type": "permission", "type": "permission",
"key": "coreprotect.restore", "key": "coreprotect.restore",
@ -477,14 +493,6 @@
"server": "survival" "server": "survival"
} }
}, },
{
"type": "permission",
"key": "openinv.enderchest.open.other",
"value": true,
"context": {
"server": "survival"
}
},
{ {
"type": "permission", "type": "permission",
"key": "openinv.inventory.open.other", "key": "openinv.inventory.open.other",
@ -609,6 +617,15 @@
} }
] ]
}, },
"clan_eye": {
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<black>ОКО 👁</black>",
"value": true
}
]
},
"default": { "default": {
"nodes": [ "nodes": [
{ {
@ -899,6 +916,11 @@
"key": "skinsrestorer.command.set", "key": "skinsrestorer.command.set",
"value": true "value": true
}, },
{
"type": "permission",
"key": "skinsrestorer.command.set.url",
"value": true
},
{ {
"type": "permission", "type": "permission",
"key": "velocity.command.server", "key": "velocity.command.server",
@ -917,10 +939,10 @@
"groups": [ "groups": [
"clan_kam", "clan_kam",
"clan_apathy", "clan_apathy",
"clan_demons" "clan_eye"
] ]
}, },
"staff": { "roles": {
"groups": [ "groups": [
"role_admin", "role_admin",
"role_moder", "role_moder",