inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-30 12:36:45 +00:00
Code

Merge remote-tracking branch 'upstream/master' into django-q

Browse Source 
# Conflicts:
#	InvenTree/InvenTree/version.py
This commit is contained in:
Oliver Walters 2021-04-11 15:03:33 +10:00
commit f9449da576
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
InvenTree/InvenTree/version.py
View File

@ -8,8 +8,7 @@ import re
import common.models import common.models
INVENTREE_SW_VERSION = "0.2.0 pre"
INVENTREE_SW_VERSION = "0.1.8 pre"
# Increment this number whenever there is a significant change to the API that any clients need to know about # Increment this number whenever there is a significant change to the API that any clients need to know about
INVENTREE_API_VERSION = 2 INVENTREE_API_VERSION = 2

12
docker/docker-compose.yml
View File

@ -34,11 +34,6 @@ services:
# InvenTree web server services # InvenTree web server services
# Uses gunicorn as the web server # Uses gunicorn as the web server
inventree: inventree:
build:
context: inventree
args:
repository: "https://github.com/SchrodingersGat/InvenTree.git"
branch: "django-q"
image: inventree/inventree:latest image: inventree/inventree:latest
container_name: inventree_server container_name: inventree_server
expose: expose:
@ -61,8 +56,6 @@ services:
# static files are served by nginx # static files are served by nginx
# web requests are redirected to gunicorn # web requests are redirected to gunicorn
nginx: nginx:
build:
context: nginx
container_name: inventree_proxy container_name: inventree_proxy
image: inventree/nginx:latest image: inventree/nginx:latest
depends_on: depends_on:
@ -75,11 +68,6 @@ services:
# background worker process handles long-running or periodic tasks # background worker process handles long-running or periodic tasks
worker: worker:
build:
context: inventree
args:
repository: "https://github.com/SchrodingersGat/InvenTree.git"
branch: "django-q"
entrypoint: ./start_worker.sh entrypoint: ./start_worker.sh
image: inventree/inventree:latest image: inventree/inventree:latest
container_name: inventree_worker container_name: inventree_worker