eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

add user-IDs to all containers

Browse source 
Signed-off-by: Simon L. <szaimen@e.mail.de>
This commit is contained in:
Simon L. 2024-11-06 14:29:18 +01:00
parent 5499bc8a5d
commit faecc028fe
11 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Containers/apache/Dockerfile
View file

@ -81,7 +81,7 @@ RUN set -ex; \
\ \
echo "root:$(openssl rand -base64 12)" | chpasswd echo "root:$(openssl rand -base64 12)" | chpasswd
USER www-data USER 33
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

2
Containers/clamav/Dockerfile
View file

@ -19,7 +19,7 @@ RUN set -ex; \
VOLUME /var/lib/clamav VOLUME /var/lib/clamav
USER clamav USER 100
LABEL com.centurylinklabs.watchtower.enable="false" LABEL com.centurylinklabs.watchtower.enable="false"

2
Containers/imaginary/Dockerfile
View file

@ -33,7 +33,7 @@ COPY --chmod=775 start.sh /start.sh
ENV PORT=9000 ENV PORT=9000
USER nobody USER 65534
# https://github.com/h2non/imaginary#memory-issues # https://github.com/h2non/imaginary#memory-issues
ENV MALLOC_ARENA_MAX=2 ENV MALLOC_ARENA_MAX=2

2
Containers/postgresql/Dockerfile
View file

@ -39,7 +39,7 @@ RUN set -ex; \
VOLUME /mnt/data VOLUME /mnt/data
USER postgres USER 999
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD /healthcheck.sh HEALTHCHECK CMD /healthcheck.sh

2
Containers/redis/Dockerfile
View file

@ -14,7 +14,7 @@ RUN set -ex; \
# Get rid of unused binaries # Get rid of unused binaries
rm -f /usr/local/bin/gosu; rm -f /usr/local/bin/gosu;
USER redis USER 999
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1 HEALTHCHECK CMD redis-cli -a $REDIS_HOST_PASSWORD PING || exit 1

4
Containers/talk-recording/Dockerfile
View file

@ -28,7 +28,7 @@ RUN set -ex; \
build-base \ build-base \
linux-headers \ linux-headers \
geckodriver; \ geckodriver; \
useradd -d /tmp --system recording; \ useradd -d /tmp --system recording -u 1000; \
# Give root a random password # Give root a random password
echo "root:$(openssl rand -base64 12)" | chpasswd; \ echo "root:$(openssl rand -base64 12)" | chpasswd; \
git clone --recursive https://github.com/nextcloud/nextcloud-talk-recording --depth=1 --single-branch --branch "$RECORDING_VERSION" /src; \ git clone --recursive https://github.com/nextcloud/nextcloud-talk-recording --depth=1 --single-branch --branch "$RECORDING_VERSION" /src; \
@ -49,7 +49,7 @@ RUN set -ex; \
linux-headers; linux-headers;
WORKDIR /tmp WORKDIR /tmp
USER recording USER 1000
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
CMD ["python", "-m", "nextcloud.talk.recording", "--config", "/conf/recording.conf"] CMD ["python", "-m", "nextcloud.talk.recording", "--config", "/conf/recording.conf"]

2
Containers/talk/Dockerfile
View file

@ -99,7 +99,7 @@ RUN set -ex; \
ln -s /opt/eturnal/bin/stun /usr/local/bin/stun; \ ln -s /opt/eturnal/bin/stun /usr/local/bin/stun; \
ln -s /opt/eturnal/bin/eturnalctl /usr/local/bin/eturnalctl ln -s /opt/eturnal/bin/eturnalctl /usr/local/bin/eturnalctl
USER eturnal USER 1000
ENTRYPOINT ["/start.sh"] ENTRYPOINT ["/start.sh"]
CMD ["supervisord", "-c", "/supervisord.conf"] CMD ["supervisord", "-c", "/supervisord.conf"]

2
Containers/whiteboard/Dockerfile
View file

@ -1,7 +1,7 @@
# syntax=docker/dockerfile:latest # syntax=docker/dockerfile:latest
FROM ghcr.io/nextcloud-releases/whiteboard:v1.0.4 FROM ghcr.io/nextcloud-releases/whiteboard:v1.0.4
USER root USER 65534
RUN set -ex; \ RUN set -ex; \
apk upgrade --no-cache -a; \ apk upgrade --no-cache -a; \
apk add --no-cache bash apk add --no-cache bash

1
manual-install/update-yaml.sh
View file

@ -19,6 +19,7 @@ OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].backup_volumes)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].nextcloud_exec_commands)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].nextcloud_exec_commands)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].image_tag)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].image_tag)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].networks)')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].networks)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[].documentation)')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-watchtower"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-domaincheck"))')"
OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-borgbackup"))')" OUTPUT="$(echo "$OUTPUT" | jq 'del(.services[] | select(.container_name == "nextcloud-aio-borgbackup"))')"

3
php/containers-schema.json
View file

@ -68,6 +68,9 @@
"stop_grace_period": { "stop_grace_period": {
"type": "integer" "type": "integer"
}, },
"user": {
"type": "integer"
},
"ports": { "ports": {
"type": "array", "type": "array",
"items": { "items": {

10
php/containers.json
View file

@ -13,6 +13,7 @@
], ],
"display_name": "Apache", "display_name": "Apache",
"image": "nextcloud/aio-apache", "image": "nextcloud/aio-apache",
"user": 33,
"init": true, "init": true,
"ports": [ "ports": [
{ {
@ -78,6 +79,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "Database", "display_name": "Database",
"image": "nextcloud/aio-postgresql", "image": "nextcloud/aio-postgresql",
"user": 999,
"init": true, "init": true,
"expose": [ "expose": [
"5432" "5432"
@ -251,6 +253,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "Notify Push", "display_name": "Notify Push",
"image": "nextcloud/aio-notify-push", "image": "nextcloud/aio-notify-push",
"user": 33,
"init": true, "init": true,
"expose": [ "expose": [
"7867" "7867"
@ -292,6 +295,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "Redis", "display_name": "Redis",
"image": "nextcloud/aio-redis", "image": "nextcloud/aio-redis",
"user": 999,
"init": true, "init": true,
"expose": [ "expose": [
"6379" "6379"
@ -328,6 +332,7 @@
"documentation": "https://github.com/nextcloud/all-in-one/discussions/1358", "documentation": "https://github.com/nextcloud/all-in-one/discussions/1358",
"display_name": "Collabora", "display_name": "Collabora",
"image": "nextcloud/aio-collabora", "image": "nextcloud/aio-collabora",
"user": 100,
"init": true, "init": true,
"expose": [ "expose": [
"9980" "9980"
@ -366,6 +371,7 @@
"documentation": "https://github.com/nextcloud/all-in-one/discussions/1358", "documentation": "https://github.com/nextcloud/all-in-one/discussions/1358",
"display_name": "Talk", "display_name": "Talk",
"image": "nextcloud/aio-talk", "image": "nextcloud/aio-talk",
"user": 1000,
"init": true, "init": true,
"ports": [ "ports": [
{ {
@ -422,6 +428,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "Talk Recording", "display_name": "Talk Recording",
"image": "nextcloud/aio-talk-recording", "image": "nextcloud/aio-talk-recording",
"user": 1000,
"init": true, "init": true,
"expose": [ "expose": [
"1234" "1234"
@ -575,6 +582,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "ClamAV", "display_name": "ClamAV",
"image": "nextcloud/aio-clamav", "image": "nextcloud/aio-clamav",
"user": 100,
"init": false, "init": false,
"expose": [ "expose": [
"3310" "3310"
@ -655,6 +663,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "Imaginary", "display_name": "Imaginary",
"image": "nextcloud/aio-imaginary", "image": "nextcloud/aio-imaginary",
"user": 65534,
"init": true, "init": true,
"expose": [ "expose": [
"9000" "9000"
@ -760,6 +769,7 @@
"image_tag": "%AIO_CHANNEL%", "image_tag": "%AIO_CHANNEL%",
"display_name": "Whiteboard", "display_name": "Whiteboard",
"image": "nextcloud/aio-whiteboard", "image": "nextcloud/aio-whiteboard",
"user": 65534,
"init": true, "init": true,
"expose": [ "expose": [
"3002" "3002"