diff --git a/Dockerfile b/Dockerfile index f9d34ec1c1..bc2dc9d9d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -127,20 +127,9 @@ FROM base as dev ENV INVENTREE_DEBUG=True -ENV INVENTREE_DEV_DIR="${INVENTREE_HOME}/dev" - # Location for python virtual environment # If the INVENTREE_PY_ENV variable is set, the entrypoint script will use it! -ENV INVENTREE_PY_ENV="${INVENTREE_DEV_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" +ENV INVENTREE_PY_ENV="${INVENTREE_DATA_DIR}/env" WORKDIR ${INVENTREE_HOME} diff --git a/docker-compose.yml b/docker-compose.yml index ff90531000..8ab381a5bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -55,7 +55,6 @@ services: volumes: # Ensure you specify the location of the 'src' directory at the end of this file - inventree_src:/home/inventree - - inventree_plugins:/home/inventree/InvenTree/plugins env_file: - .env restart: unless-stopped @@ -70,7 +69,6 @@ services: volumes: # Ensure you specify the location of the 'src' directory at the end of this file - inventree_src:/home/inventree - - inventree_plugins:/home/inventree/InvenTree/plugins env_file: - .env restart: unless-stopped @@ -104,10 +102,3 @@ volumes: # This directory specified where InvenTree source code is stored "outside" the docker containers # By default, this directory is one level above the "docker" directory 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} diff --git a/docker/production/.env b/docker/production/.env index a8d7a2970b..171f2053e6 100644 --- a/docker/production/.env +++ b/docker/production/.env @@ -9,9 +9,6 @@ # e.g. Windows (docker desktop) #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 INVENTREE_WEB_PORT=1337