inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-10-31 05:05:42 +00:00
Code Activity

Tweaks to dockerfile

Browse Source
This commit is contained in:
Oliver Walters
2022-04-21 00:01:11 +10:00
parent 6929d07f42
commit 0c93009bf7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/Dockerfile
View File

@@ -110,7 +110,8 @@ RUN pip3 install --user --no-cache-dir --disable-pip-version-check -r ${INVENTRE
WORKDIR ${INVENTREE_MNG_DIR} WORKDIR ${INVENTREE_MNG_DIR}
# Server init entrypoint # Server init entrypoint
ENTRYPOINT ["/bin/bash", "../docker/init.sh"] COPY init.sh ${INVENTREE_HOME}/init.sh
ENTRYPOINT ["/bin/bash", "${INVENTREE_HOME}/init.sh"]
# Launch the production server # Launch the production server
# TODO: Work out why environment variables cannot be interpolated in this command # TODO: Work out why environment variables cannot be interpolated in this command
@@ -137,7 +138,6 @@ ENV INVENTREE_CONFIG_FILE="${INVENTREE_DEV_DIR}/config.yaml"
ENV INVENTREE_SECRET_KEY_FILE="${INVENTREE_DEV_DIR}/secret_key.txt" ENV INVENTREE_SECRET_KEY_FILE="${INVENTREE_DEV_DIR}/secret_key.txt"
ENV INVENTREE_PLUGIN_FILE="${INVENTREE_DEV_DIR}/plugins.txt" ENV INVENTREE_PLUGIN_FILE="${INVENTREE_DEV_DIR}/plugins.txt"
WORKDIR ${INVENTREE_HOME} WORKDIR ${INVENTREE_HOME}
# Entrypoint ensures that we are running in the python virtual environment # Entrypoint ensures that we are running in the python virtual environment

2
docker/init.sh
View File

@@ -33,7 +33,7 @@ if [[ -n "$INVENTREE_PY_ENV" ]]; then
source ${INVENTREE_PY_ENV}/bin/activate source ${INVENTREE_PY_ENV}/bin/activate
# Note: Python packages will have to be installed on first run # Note: Python packages will have to be installed on first run
# e.g docker-compose -f docker-compose.dev.yml run inventree-dev-server invoke install # e.g docker-compose run inventree-dev-server invoke update
fi fi
cd ${INVENTREE_HOME} cd ${INVENTREE_HOME}