Compare commits

..

9 Commits

Author SHA1 Message Date
87aee184c4
change clans' prefixes 2025-08-13 20:44:30 +03:00
c4fda21c32
add SkinsRestorer update permission 2025-08-13 20:44:30 +03:00
9eb4e9f626
configure ImageFrame permissions 2025-08-13 20:44:30 +03:00
1584d8253f Merge pull request 'feature-42-image-size-optimization-and-uid-gid-selection' (#22) from feature-42 into develop
All checks were successful
/ build-docker (push) Successful in 9m1s
Reviewed-on: #22
2025-08-12 19:34:08 +00:00
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
3 changed files with 116 additions and 7 deletions

View File

@ -18,13 +18,20 @@ RUN touch ${DATA_PATH}/pv-groups.json && \
# 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
@ -60,13 +67,19 @@ ENV SONAR_DB_NAME=sonar_db
ENV SONAR_DB_USERNAME=sonar
ENV SONAR_DB_PASSWORD=0000
WORKDIR ${WORKDIR_PATH}/config
EXPOSE 25565/tcp
WORKDIR ${WORKDIR_PATH}/config
# TODO: Make awk commands sapn multiple lines
# TODO: Use one call to awk to perform substitutions
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" 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_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

@ -181,6 +181,30 @@
},
"role_moder": {
"nodes": [
{
"type": "permission",
"key": "imageframe.list.others",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.adminsetcreator",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.admindelete",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "minecraft.command.gamemode.spectator",
@ -577,6 +601,14 @@
},
"role_elder": {
"nodes": [
{
"type": "permission",
"key": "imageframe.createlimit.role_elder",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "commandwhitelist.group.role_elder",
@ -603,7 +635,7 @@
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<aqua>Апатия 💰</aqua>",
"key": "prefix.10.<color:#c0c0c0>LA ⚔️</color>",
"value": true
}
]
@ -612,7 +644,7 @@
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<dark_red>KAM ⚒</dark_red>",
"key": "prefix.10.<dark_red>КАМ</dark_red>",
"value": true
}
]
@ -621,13 +653,69 @@
"nodes": [
{
"type": "prefix",
"key": "prefix.10.<black>ОКО 👁</black>",
"key": "prefix.10.<color:#ed7702>ОКО 👁</color>",
"value": true
}
]
},
"default": {
"nodes": [
{
"type": "permission",
"key": "imageframe.createlimit.default",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.create",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.create.animated",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.select",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.list",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.delete",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "imageframe.setaccess",
"value": true,
"context": {
"server": "survival"
}
},
{
"type": "permission",
"key": "carbon.channel.global.see",
@ -921,6 +1009,11 @@
"key": "skinsrestorer.command.set.url",
"value": true
},
{
"type": "permission",
"key": "skinsrestorer.command.update",
"value": true
},
{
"type": "permission",
"key": "velocity.command.server",