github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-07 05:31:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improve Docker exec user

Browse source
This commit is contained in:
JonnyWong16 2020-10-30 21:27:39 -07:00
parent ac24acf9ce
commit 14346b0e69
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

@ -11,13 +11,16 @@ ENV TZ=UTC
WORKDIR /app WORKDIR /app
RUN \ RUN \
groupadd -g 1000 tautulli && \
useradd -u 1000 -g 1000 tautulli && \
echo ${BRANCH} > /app/branch.txt && \ echo ${BRANCH} > /app/branch.txt && \
echo ${COMMIT} > /app/version.txt echo ${COMMIT} > /app/version.txt
COPY . /app COPY . /app
CMD [ "python", "Tautulli.py", "--datadir", "/config" ]
ENTRYPOINT [ "./start.sh" ] ENTRYPOINT [ "./start.sh" ]
VOLUME /config VOLUME /config
EXPOSE 8181 EXPOSE 8181
HEALTHCHECK --start-period=90s CMD curl -ILfSs http://localhost:8181/status > /dev/null || curl -ILfkSs https://localhost:8181/status > /dev/null || exit 1 HEALTHCHECK --start-period=90s CMD curl -ILfSs http://localhost:8181/status > /dev/null || curl -ILfkSs https://localhost:8181/status > /dev/null || exit 1

19
start.sh
View file

@ -1,21 +1,16 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [[ "$TAUTULLI_DOCKER" == "True" ]]; then if [[ "$TAUTULLI_DOCKER" == "True" ]]; then
if [[ -n $PUID && -n $PGID ]]; then PUID=${PUID:-1000}
getent group "$PGID" 2>&1 > /dev/null || groupadd -g "$PGID" tautulli PGID=${PGID:-1000}
getent passwd "$PUID" 2>&1 > /dev/null || useradd -r -u "$PUID" -g "$PGID" tautulli
user=$(getent passwd "$PUID" | cut -d: -f1) groupmod -o -g $PGID tautulli
group=$(getent group "$PGID" | cut -d: -f1) usermod -o -u $PUID tautulli
usermod -a -G root "$user"
chown -R "$user":"$group" /config chown -R tautulli:tautulli /config
echo "Running Tautulli using user $user (uid=$PUID) and group $group (gid=$PGID)" echo "Running Tautulli using user tautulli (uid=$(id -u tautulli)) and group tautulli (gid=$(id -g tautulli))"
su "$user" -g "$group" -c "python /app/Tautulli.py --datadir /config" exec gosu tautulli "$@"
else
python Tautulli.py --datadir /config
fi
else else
python_versions=("python3" "python3.8" "python3.7" "python3.6" "python" "python2" "python2.7") python_versions=("python3" "python3.8" "python3.7" "python3.6" "python" "python2" "python2.7")
for cmd in "${python_versions[@]}"; do for cmd in "${python_versions[@]}"; do