From 5f9236d280faeef96c474a57c3b8930dd2748a93 Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Sun, 11 Apr 2021 14:46:40 +1000 Subject: [PATCH] Updates to docker files --- docker/docker-compose.yml | 3 ++- docker/inventree/Dockerfile | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8ef272ece2..c802444c79 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -64,6 +64,7 @@ services: build: context: nginx container_name: inventree_proxy + image: inventree/nginx:latest depends_on: - inventree ports: @@ -80,7 +81,7 @@ services: repository: "https://github.com/SchrodingersGat/InvenTree.git" branch: "django-q" entrypoint: ./start_worker.sh - image: inventree/worker:latest + image: inventree/inventree:latest container_name: inventree_worker depends_on: - db diff --git a/docker/inventree/Dockerfile b/docker/inventree/Dockerfile index 91870b6551..fcba19e964 100644 --- a/docker/inventree/Dockerfile +++ b/docker/inventree/Dockerfile @@ -91,7 +91,5 @@ RUN chmod 755 ${INVENTREE_SRC_DIR}/start_worker.sh # exec commands should be executed from the "src" directory WORKDIR ${INVENTREE_SRC_DIR} -USER inventree - # Let us begin CMD ["bash", "./start_server.sh"]