diff --git a/Dockerfile b/Dockerfile index 7e270c1..5083d2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -29,5 +29,6 @@ RUN mkdir -p /etc/ftracker /var/ftracker \ +STOPSIGNAL SIGINT RUN chmod +x ./res/docker-entrypoint.sh ENTRYPOINT [ "./res/docker-entrypoint.sh" ] diff --git a/README.md b/README.md index 6ac32a1..5aa8ae4 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,16 @@ There are 2 methods: Docker and Manual. ### Method A: Docker -Build the container with +Pull the container from docker hub using ```bash -sudo docker build . -t ftracker +sudo docker pull fasttube/ftracker +``` + +OR build the container locally with + +```bash +sudo docker build . -t fasttube/ftracker ``` Then, if you want the container to also handle SSL so it can run standalone you @@ -44,14 +50,14 @@ encrypt`: ```bash sudo docker run \ - -d \ + -it --rm \ --name ftracker \ -e DOMAIN=example.com \ -e LE_EMAIL=admin@example.com \ -p 80:80 \ -p 443:443 \ -v /your/full/path/to/config.ini:/etc/ftracker/config.ini \ - ftracker + fasttube/ftracker ``` Otherwise you can run it without SSL (maybe behind your own web+ssl server) @@ -59,13 +65,16 @@ using just ```bash sudo docker run \ - -d \ + -it --rm \ --name ftracker \ -p 80:80 \ -v /your/full/path/to/config.ini:/etc/ftracker/config.ini \ - ftracker + fasttube/ftracker ``` +If those work in the foreground and averything looks okay, you can start them +without `-it --rm` and with `-d` instead to run them in the background. + To stop/start/uninstall the container afterwards, run: ```bash diff --git a/res/docker-entrypoint.sh b/res/docker-entrypoint.sh index c626114..ef08f87 100644 --- a/res/docker-entrypoint.sh +++ b/res/docker-entrypoint.sh @@ -27,4 +27,4 @@ fi echo " >>> Starting uwsgi <<< " -/usr/sbin/uwsgi --ini /root/ftracker/res/ftracker.alpine.uwsgi.ini +exec /usr/sbin/uwsgi --ini /root/ftracker/res/ftracker.alpine.uwsgi.ini