diff --git a/.gitignore b/.gitignore index df432a4..5f4d82f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .jenkins-external +docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml.dist similarity index 86% rename from docker-compose.yml rename to docker-compose.yml.dist index 3d8eb3f..3476739 100644 --- a/docker-compose.yml +++ b/docker-compose.yml.dist @@ -2,7 +2,7 @@ version: "2.1" services: mastodon: - image: dev.cat-enby.club/nikurasu/docker-mastodon:latest-hometown + image: dev.cat-enby.club/nikurasu/hometown:v1.0.7-3.5.5 container_name: mastodon environment: - PUID=1000 @@ -23,9 +23,9 @@ services: - VAPID_PUBLIC_KEY=sg - SMTP_SERVER=mail.your-server.de - SMTP_PORT=25 - - SMTP_LOGIN=notify.cat-enby.club@nikurasu.gay - - SMTP_PASSWORD=6fs11V0LoPPav7gl - - SMTP_FROM_ADDRESS=notify.cat-enby.club@nikurasu.gay + - SMTP_LOGIN= + - SMTP_PASSWORD= + - SMTP_FROM_ADDRESS= - S3_ENABLED=false - WEB_DOMAIN=localhost #optional - ES_HOST=es #optional diff --git a/root/etc/cont-init.d/10-adduser b/root/etc/cont-init.d/10-adduser new file mode 100755 index 0000000..7a6f087 --- /dev/null +++ b/root/etc/cont-init.d/10-adduser @@ -0,0 +1,58 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +PUID=${PUID:-911} +PGID=${PGID:-911} + +groupmod -o -g "$PGID" abc +usermod -o -u "$PUID" abc + +echo ' +------------------------------------- + _ _ _ _ + | \ | (_| | _ _ _ + | \| | | |/ | | | | + | |\ | | <| |_| | + |_| \_|_|_|\_ \__,_| + +Brought to you by nikurasu, but based +on the work of linuxserver.io +-------------------------------------' +if [[ -f /donate.txt ]]; then + echo ' +To support the app dev(s) visit:' + cat /donate.txt +fi +echo ' +To support LSIO projects visit: +https://www.linuxserver.io/donate/ +------------------------------------- +GID/UID +-------------------------------------' +echo " +User uid: $(id -u abc) +User gid: $(id -g abc) +------------------------------------- +" + +time32="$(date +%Y)" + +if [[ "${time32}" == "1970" || "${time32}" == "1969" ]] && [ "$(uname -m)" == "armv7l" ]; then + echo ' +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + +Your DockerHost is running an outdated version of libseccomp + +To fix this, please visit https://docs.linuxserver.io/faq#libseccomp + +Apps will not behave correctly without this + +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +' + sleep infinity +fi + +chown abc:abc /app +chown abc:abc /config +chown abc:abc /defaults +