From f17177cf4717b1699df609073fd69c2ba8122b68 Mon Sep 17 00:00:00 2001 From: Adrian Amaglio Date: Fri, 1 May 2020 16:00:41 +0200 Subject: [PATCH] migration to public docker.io registry & more uwsgi options --- Dockerfile | 3 ++- build_docker.sh | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index dd31529..3fc4578 100755 --- a/Dockerfile +++ b/Dockerfile @@ -15,4 +15,5 @@ COPY ./main.py ./list.tpl ./ # I juste wanted to change the socket owner but it turned out I needed to change thu uwsgi user #CMD uwsgi --exec-asap 'chown $UID:$UID /tmp/uwsgi/ ; mkdir -p $BASE_PATH && chown $UID:$UID $BASE_PATH' -s /tmp/uwsgi/uwsgi.sock --uid $UID --manage-script-name --mount /=server:app # --log-master makes 500 error on 30s timeout for every valid http request -CMD uwsgi --chown-socket $UID -s /tmp/uwsgi/uwsgi.sock --manage-script-name --mount $MOUNT=main:app --master --hook-master-start "unix_signal:15 gracefully_kill_them_all" --need-app --die-on-term --show-config --log-master +CMD uwsgi --chown-socket $UID -s /tmp/uwsgi/uwsgi.sock --manage-script-name --mount $MOUNT=main:prod_app --http-timeout 10 --master --hook-master-start "unix_signal:15 gracefully_kill_them_all" --need-app --die-on-term --show-config --log-master --strict --vacuum --single-interpreter +#--logto /dev/stderr --logto2 /dev/stderr diff --git a/build_docker.sh b/build_docker.sh index 99159bc..be3f668 100755 --- a/build_docker.sh +++ b/build_docker.sh @@ -1,5 +1,5 @@ set -e version=2.0.1 -docker build -t registry.jean-cloud.net/contact-mailer:latest -t registry.jean-cloud.net/contact-mailer:$version . -docker push registry.jean-cloud.net/contact-mailer:latest -docker push registry.jean-cloud.net/contact-mailer:$version +docker build -t jeancloud/contact-mailer:latest -t jeancloud/contact-mailer:$version . +docker push jeancloud/contact-mailer:latest +docker push jeancloud/contact-mailer:$version