Use variable for datastore in Docker entrypoint

pull/722/head
jeanluc 3 years ago
parent a48b75d4ac
commit 10cc499ab3
No known key found for this signature in database
GPG Key ID: 3EB52D4C754CD898

@ -62,7 +62,8 @@ RUN sed -i 's/^CipherString = .*/CipherString = DEFAULT@SECLEVEL=1/' /etc/ssl/op
# Copy modules over to the final image and add their dir to PYTHONPATH # Copy modules over to the final image and add their dir to PYTHONPATH
COPY --from=builder /dependencies /usr/local COPY --from=builder /dependencies /usr/local
ENV PYTHONPATH=/usr/local ENV PYTHONPATH=/usr/local \
DATASTORE_DIR="/datastore"
EXPOSE 5000 EXPOSE 5000

@ -2,9 +2,11 @@
set -eu set -eu
DATASTORE_DIR="${DATASTORE_DIR:-/datastore}"
# If the first argument looks like a flag, assume we want to run changedetection # If the first argument looks like a flag, assume we want to run changedetection
if [ "${1:0:1}" = '-' ]; then if [ "${1:0:1}" = '-' ]; then
set -- python ./changedetection.py -d /datastore "$@" set -- python ./changedetection.py -d "$DATASTORE_DIR" "$@"
fi fi
# If we're running as root, by default make sure process uid/gid # If we're running as root, by default make sure process uid/gid
@ -18,7 +20,7 @@ if [ "$(id -u)" = '0' -a -n "${KEEP_PRIVILEGES:-}" ]; then
usermod -o -u "$PUID" changedetection usermod -o -u "$PUID" changedetection
# Look for files in datadir not owned by the correct user and chown them # Look for files in datadir not owned by the correct user and chown them
find "/datastore" \! -user changedetection -exec chown changedetection '{}' + find "$DATASTORE_DIR" \! -user changedetection -exec chown changedetection '{}' +
# Restart this script as an unprivileged user # Restart this script as an unprivileged user
exec gosu changedetection:changedetection "$BASH_SOURCE" "$@" exec gosu changedetection:changedetection "$BASH_SOURCE" "$@"

Loading…
Cancel
Save