From 719b1775f2619e2c3e69b752cf969b4a51fb4451 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 12 May 2021 22:12:26 +1000 Subject: [PATCH] Add entrypoint for running development worker --- docker/Dockerfile | 2 ++ docker/docker-compose.dev.yml | 3 ++- docker/start_dev_worker.sh | 19 +++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 docker/start_dev_worker.sh diff --git a/docker/Dockerfile b/docker/Dockerfile index 61defc1607..3e0a7e1230 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -105,6 +105,8 @@ FROM base as dev WORKDIR ${INVENTREE_SRC_DIR} COPY start_dev_server.sh ${INVENTREE_HOME}/start_dev_server.sh +COPY start_dev_worker.sh ${INVENTREE_HOME}/start_dev_worker.sh RUN chmod 755 ${INVENTREE_HOME}/start_dev_server.sh +RUN chmod 755 ${INVENTREE_HOME}/start_dev_worker.sh CMD ["bash", "/home/inventree/start_dev_server.sh"] diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml index d6e6afb665..ddf50135c9 100644 --- a/docker/docker-compose.dev.yml +++ b/docker/docker-compose.dev.yml @@ -35,7 +35,8 @@ services: build: context: . target: dev - entrypoint: invoke worker + entrypoint: /home/inventree/start_dev_worker.sh + depends_on: - inventree-server volumes: # Ensure you specify the location of the 'src' directory at the end of this file diff --git a/docker/start_dev_worker.sh b/docker/start_dev_worker.sh new file mode 100644 index 0000000000..099f447a9c --- /dev/null +++ b/docker/start_dev_worker.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +echo "Starting InvenTree worker..." + +cd $INVENTREE_SRC_DIR + +# Activate virtual environment +source inventree-docker-dev/bin/activate + +sleep 5 + +# Wait for the database to be ready +cd $INVENTREE_MNG_DIR +python manage.py wait_for_db + +sleep 10 + +# Now we can launch the background worker process +python manage.py qcluster