mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Docker compose plugins fix (#3357)
* Simplify dockerfile - remove INVENTREE_DEV_DIR - We can simply use INVENTREE_DATA_DIR - Will need to update the documentation * Remove plugin dir support from production docker-compose file
This commit is contained in:
parent
f0d69ec458
commit
5bb76a3730
13
Dockerfile
13
Dockerfile
@ -127,20 +127,9 @@ FROM base as dev
|
|||||||
|
|
||||||
ENV INVENTREE_DEBUG=True
|
ENV INVENTREE_DEBUG=True
|
||||||
|
|
||||||
ENV INVENTREE_DEV_DIR="${INVENTREE_HOME}/dev"
|
|
||||||
|
|
||||||
# Location for python virtual environment
|
# Location for python virtual environment
|
||||||
# If the INVENTREE_PY_ENV variable is set, the entrypoint script will use it!
|
# If the INVENTREE_PY_ENV variable is set, the entrypoint script will use it!
|
||||||
ENV INVENTREE_PY_ENV="${INVENTREE_DEV_DIR}/env"
|
ENV INVENTREE_PY_ENV="${INVENTREE_DATA_DIR}/env"
|
||||||
|
|
||||||
# Override default path settings
|
|
||||||
ENV INVENTREE_STATIC_ROOT="${INVENTREE_DEV_DIR}/static"
|
|
||||||
ENV INVENTREE_MEDIA_ROOT="${INVENTREE_DEV_DIR}/media"
|
|
||||||
ENV INVENTREE_PLUGIN_DIR="${INVENTREE_DEV_DIR}/plugins"
|
|
||||||
|
|
||||||
ENV INVENTREE_CONFIG_FILE="${INVENTREE_DEV_DIR}/config.yaml"
|
|
||||||
ENV INVENTREE_SECRET_KEY_FILE="${INVENTREE_DEV_DIR}/secret_key.txt"
|
|
||||||
ENV INVENTREE_PLUGIN_FILE="${INVENTREE_DEV_DIR}/plugins.txt"
|
|
||||||
|
|
||||||
WORKDIR ${INVENTREE_HOME}
|
WORKDIR ${INVENTREE_HOME}
|
||||||
|
|
||||||
|
@ -55,7 +55,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
# Ensure you specify the location of the 'src' directory at the end of this file
|
# Ensure you specify the location of the 'src' directory at the end of this file
|
||||||
- inventree_src:/home/inventree
|
- inventree_src:/home/inventree
|
||||||
- inventree_plugins:/home/inventree/InvenTree/plugins
|
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -70,7 +69,6 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
# Ensure you specify the location of the 'src' directory at the end of this file
|
# Ensure you specify the location of the 'src' directory at the end of this file
|
||||||
- inventree_src:/home/inventree
|
- inventree_src:/home/inventree
|
||||||
- inventree_plugins:/home/inventree/InvenTree/plugins
|
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
restart: unless-stopped
|
restart: unless-stopped
|
||||||
@ -104,10 +102,3 @@ volumes:
|
|||||||
# This directory specified where InvenTree source code is stored "outside" the docker containers
|
# This directory specified where InvenTree source code is stored "outside" the docker containers
|
||||||
# By default, this directory is one level above the "docker" directory
|
# By default, this directory is one level above the "docker" directory
|
||||||
device: ${INVENTREE_EXT_VOLUME:-./}
|
device: ${INVENTREE_EXT_VOLUME:-./}
|
||||||
inventree_plugins:
|
|
||||||
driver: local
|
|
||||||
driver_opts:
|
|
||||||
type: none
|
|
||||||
o: bind
|
|
||||||
# This directory specified where the optional local plugin directory is stored "outside" the docker containers
|
|
||||||
device: ${INVENTREE_EXT_PLUGINS:-../InvenTree/plugins}
|
|
||||||
|
@ -9,9 +9,6 @@
|
|||||||
# e.g. Windows (docker desktop)
|
# e.g. Windows (docker desktop)
|
||||||
#INVENTREE_EXT_VOLUME=c:/Users/me/inventree-data
|
#INVENTREE_EXT_VOLUME=c:/Users/me/inventree-data
|
||||||
|
|
||||||
# Location of optional plugin directory
|
|
||||||
# INVENTREE_EXT_PLUGINS=/home/me/inventree-data/plugins
|
|
||||||
|
|
||||||
# Default web port for the InvenTree server
|
# Default web port for the InvenTree server
|
||||||
INVENTREE_WEB_PORT=1337
|
INVENTREE_WEB_PORT=1337
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user