From 3289fa1aaac759e077d245ad5fba246d5043d79b Mon Sep 17 00:00:00 2001 From: pictuga Date: Sun, 21 Nov 2021 19:35:42 +0100 Subject: [PATCH] Heroku --- Dockerfile | 3 ++- README.md | 4 ++++ app.json | 1 + docker-entry.sh | 4 +++- heroku.yml | 9 +++++++++ 5 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 app.json create mode 100644 heroku.yml diff --git a/Dockerfile b/Dockerfile index 6a22947..5b7e7ad 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,4 +7,5 @@ RUN pip3 install --no-cache-dir /app[full] gunicorn USER 1000:1000 -ENTRYPOINT ["/app/docker-entry.sh"] +ENTRYPOINT ["/bin/sh", "/app/docker-entry.sh"] +CMD [] diff --git a/README.md b/README.md index 5ad1035..4b72a00 100644 --- a/README.md +++ b/README.md @@ -92,6 +92,10 @@ Then execute docker-compose build --no-cache --pull ``` +Using Heroku free tier: + +[Deploy to Heroku](https://heroku.com/deploy?template=https://github.com/pictuga/morss) + ## Run morss will auto-detect what "mode" to use. diff --git a/app.json b/app.json new file mode 100644 index 0000000..7d2d73b --- /dev/null +++ b/app.json @@ -0,0 +1 @@ +{"stack": "container"} diff --git a/docker-entry.sh b/docker-entry.sh index aa7122a..5cb37cb 100755 --- a/docker-entry.sh +++ b/docker-entry.sh @@ -1,7 +1,9 @@ #! /bin/sh +echo "$@" + if [ ! -z "$1" ]; then morss $@ else - gunicorn --bind 0.0.0.0:8000 -w 4 --preload --access-logfile - morss + gunicorn --bind 0.0.0.0:${PORT:-8000} -w 4 --preload --access-logfile - morss fi diff --git a/heroku.yml b/heroku.yml new file mode 100644 index 0000000..07c44aa --- /dev/null +++ b/heroku.yml @@ -0,0 +1,9 @@ +setup: + config: + DEBUG: 1 + CACHE: diskcache + CACHE_SIZE: 1073741824 + +build: + docker: + worker: Dockerfile