From 124db01b63c604233f5ec946f4b9717b6e5fc4d8 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 18 Apr 2021 14:45:41 +1000 Subject: [PATCH 1/6] Add binaries for database dumping --- docker/inventree/Dockerfile | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index fcba19e964..f5fb538eb7 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -56,11 +56,22 @@ RUN apk add --no-cache git make bash \ libjpeg-turbo libjpeg-turbo-dev jpeg jpeg-dev \ libffi libffi-dev \ zlib zlib-dev + +# Cairo deps for WeasyPrint (these will be deprecated once WeasyPrint drops cairo requirement) RUN apk add --no-cache cairo cairo-dev pango pango-dev RUN apk add --no-cache fontconfig ttf-droid ttf-liberation ttf-dejavu ttf-opensans ttf-ubuntu-font-family font-croscore font-noto -RUN apk add --no-cache python3 -RUN apk add --no-cache postgresql-contrib postgresql-dev libpq -RUN apk add --no-cache mariadb-connector-c mariadb-dev + +# Python +RUN apk add --no-cache python3 python3-dev python3-pip + +# SQLite support +RUN apk add --no-cache sqlite3 + +# PostgreSQL support +RUN apk add --no-cache postgresql-contrib postgresql-dev libpq pg_dump + +# MySQL support +RUN apk add --no-cache mariadb-connector-c mariadb-dev mysqldump # Create required directories #RUN mkdir ${INVENTREE_DATA_DIR}}/media ${INVENTREE_HOME}/static ${INVENTREE_HOME}/backup From 75054f870ed336d797745e982f3c96f3c5a88890 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 18 Apr 2021 14:50:22 +1000 Subject: [PATCH 2/6] Fix --- docker/inventree/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index f5fb538eb7..b9e52ed863 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -62,7 +62,7 @@ RUN apk add --no-cache cairo cairo-dev pango pango-dev RUN apk add --no-cache fontconfig ttf-droid ttf-liberation ttf-dejavu ttf-opensans ttf-ubuntu-font-family font-croscore font-noto # Python -RUN apk add --no-cache python3 python3-dev python3-pip +RUN apk add --no-cache python3 python3-dev # SQLite support RUN apk add --no-cache sqlite3 From cbb94d2ff75fd6713fb21d50e10f21465776aae9 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 18 Apr 2021 14:57:25 +1000 Subject: [PATCH 3/6] sqlite3 -> sqlite --- docker/inventree/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index b9e52ed863..6e3166028c 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -65,7 +65,7 @@ RUN apk add --no-cache fontconfig ttf-droid ttf-liberation ttf-dejavu ttf-opensa RUN apk add --no-cache python3 python3-dev # SQLite support -RUN apk add --no-cache sqlite3 +RUN apk add --no-cache sqlite # PostgreSQL support RUN apk add --no-cache postgresql-contrib postgresql-dev libpq pg_dump From c07aef7f752e1011c50b03f273504706221e930f Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 18 Apr 2021 14:58:02 +1000 Subject: [PATCH 4/6] Remove commented line --- docker/inventree/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index 6e3166028c..42d18d04c6 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -73,9 +73,6 @@ RUN apk add --no-cache postgresql-contrib postgresql-dev libpq pg_dump # MySQL support RUN apk add --no-cache mariadb-connector-c mariadb-dev mysqldump -# Create required directories -#RUN mkdir ${INVENTREE_DATA_DIR}}/media ${INVENTREE_HOME}/static ${INVENTREE_HOME}/backup - # Install required python packages RUN pip install --upgrade pip setuptools wheel RUN pip install --no-cache-dir -U invoke From 69473b9bff5c36cbd4f3cdcc0722164276883bb8 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 18 Apr 2021 15:05:52 +1000 Subject: [PATCH 5/6] Fix install Also make the web port configurable --- docker/inventree/Dockerfile | 5 ++++- docker/inventree/start_server.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index 42d18d04c6..43ac865169 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -26,6 +26,9 @@ ENV INVENTREE_BACKUP_DIR="${INVENTREE_DATA_DIR}/backup" ENV INVENTREE_CONFIG_FILE="${INVENTREE_DATA_DIR}/config.yaml" ENV INVENTREE_SECRET_KEY_FILE="${INVENTREE_DATA_DIR}/secret_key.txt" +# Default web server port is 8000 +ENV INVENTREE_WEB_PORT="8000" + # Pass DB configuration through as environment variables ENV INVENTREE_DB_ENGINE="${INVENTREE_DB_ENGINE}" ENV INVENTREE_DB_NAME="${INVENTREE_DB_NAME}" @@ -68,7 +71,7 @@ RUN apk add --no-cache python3 python3-dev RUN apk add --no-cache sqlite # PostgreSQL support -RUN apk add --no-cache postgresql-contrib postgresql-dev libpq pg_dump +RUN apk add --no-cache postgresql postgresql-contrib postgresql-dev libpq # MySQL support RUN apk add --no-cache mariadb-connector-c mariadb-dev mysqldump diff --git a/docker/inventree/start_server.sh b/docker/inventree/start_server.sh index 0436cd532f..db9f1594ae 100644 --- a/docker/inventree/start_server.sh +++ b/docker/inventree/start_server.sh @@ -43,4 +43,4 @@ python manage.py collectstatic --noinput || exit 1 python manage.py clearsessions || exit 1 # Now we can launch the server -gunicorn -c $INVENTREE_HOME/gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:8080 +gunicorn -c $INVENTREE_HOME/gunicorn.conf.py InvenTree.wsgi -b 0.0.0.0:$INVENTREE_WEB_PORT From 9eb559bec5c6021519c1c4f83b074e6a3a1e5d36 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 18 Apr 2021 15:09:01 +1000 Subject: [PATCH 6/6] More install fixes --- docker/inventree/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index 43ac865169..2911da907a 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -74,7 +74,7 @@ RUN apk add --no-cache sqlite RUN apk add --no-cache postgresql postgresql-contrib postgresql-dev libpq # MySQL support -RUN apk add --no-cache mariadb-connector-c mariadb-dev mysqldump +RUN apk add --no-cache mariadb-connector-c mariadb-dev mariadb-client # Install required python packages RUN pip install --upgrade pip setuptools wheel