diff --git a/Dockerfile b/Dockerfile index 000801d..2eef717 100644 --- a/Dockerfile +++ b/Dockerfile @@ -26,10 +26,7 @@ COPY ./src/ . # RUN useradd --system --groups sudo --shell /bin/bash archiver && chown -R archiver:sudo . # USER archiver -ADD docker-entrypoint.sh /docker-entrypoint.sh -ENTRYPOINT ["/docker-entrypoint.sh"] - -CMD ["python3"] +ENTRYPOINT ["pipenv", "run", "python3", "-m", "auto_archiver"] # should be executed with 2 volumes (3 if local_storage) # docker run -v /var/run/docker.sock:/var/run/docker.sock -v $PWD/secrets:/app/secrets -v $PWD/local_archive:/app/local_archive aa --help \ No newline at end of file diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh deleted file mode 100755 index d8224bc..0000000 --- a/docker-entrypoint.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# Get UID/GID from volume dir - -VOLUME_UID=$(stat -c '%u' /crawls) -VOLUME_GID=$(stat -c '%g' /crawls) - -# Get the UID/GID we are running as - -MY_UID=$(id -u) -MY_GID=$(id -g) - -# If we aren't running as the owner of the /crawls/ dir then add a new user -# btrix with the same UID/GID of the /crawls dir and run as that user instead. - -if [ "$MY_GID" != "$VOLUME_GID" ] || [ "$MY_UID" != "$VOLUME_UID" ]; then - groupadd btrix - groupmod -o --gid $VOLUME_GID btrix - - useradd -ms /bin/bash -g $VOLUME_GID btrix - usermod -o -u $VOLUME_UID btrix > /dev/null - - su btrix -c '"$@"' -- argv0-ignore "$@" -else - exec "$@" -fi -