From 00c4519d2863a6d801ad12ad17de549b605d36c7 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Fri, 2 Apr 2021 00:54:29 +1100 Subject: [PATCH] Simplify dockerfile --- docker/Dockerfile | 12 ------------ docker/supervisor.conf | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a9eaef612b..99131700ee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,22 +5,10 @@ ARG INVENTREE_REPO="https://github.com/inventree/InvenTree.git" ARG INVENTREE_VERSION="master" ARG INVENTREE_CONFIG_FILE="InvenTree/config_template.yaml" -# InvenTree server port -ARG INVENTREE_PORT="80" - -# Database configuration options -ARG INVENTREE_DB_ENGINE="sqlite3" -ARG INVENTREE_DB_NAME="inventree_db.sqlite3" -ARG INVENTREE_DB_HOST="127.0.0.1" -ARG INVENTREE_DB_PORT="" -ARG INVENTREE_DB_USER="" -ARG INVENTREE_DB_PASSWORD="" - ENV PYTHONUNBUFFERED 1 # InvenTree key settings ENV INVENTREE_HOME="/home/inventree" -ENV INVENTREE_PORT="${INVENTREE_PORT}" ENV INVENTREE_LOG_LEVEL="INFO" diff --git a/docker/supervisor.conf b/docker/supervisor.conf index 363bbe6b4a..554200837d 100644 --- a/docker/supervisor.conf +++ b/docker/supervisor.conf @@ -18,7 +18,7 @@ nodaemon=true [program:inventree-server] user=inventree directory=%(ENV_INVENTREE_SRC_DIR)s/InvenTree -command=%(ENV_INVENTREE_VENV)s/bin/gunicorn -c %(ENV_INVENTREE_HOME)s/gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:%(ENV_INVENTREE_PORT)s +command=%(ENV_INVENTREE_VENV)s/bin/gunicorn -c %(ENV_INVENTREE_HOME)s/gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:80 startsecs=10 autostart=true autorestart=true