Merge branch 'master' of https://github.com/inventree/InvenTree into matmair/issue6281

contrib/container/Caddyfile

@@ -71,9 +71,7 @@
 	reverse_proxy {$INVENTREE_SERVER:"http://inventree-server:8000"} {
 
 		# If you are running behind another proxy, you may need to specify 'trusted_proxies'
-		trusted_proxies {
-			# enter your trusted proxy IP addresses here
-		}
-
+		# Ref: https://caddyserver.com/docs/json/apps/http/servers/trusted_proxies/
+		# trusted_proxies ...
 	}
 }

contrib/container/Dockerfile

@@ -171,4 +171,4 @@ WORKDIR ${INVENTREE_HOME}
 ENTRYPOINT ["/bin/ash", "./contrib/container/init.sh"]
 
 # Launch the development server
-CMD ["invoke", "server", "-a", "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}"]
+CMD ["invoke", "dev.server", "-a", "${INVENTREE_WEB_ADDR}:${INVENTREE_WEB_PORT}"]

contrib/container/init.sh

@@ -40,14 +40,17 @@ if [[ -n "$INVENTREE_PY_ENV" ]]; then
     if test -d "$INVENTREE_PY_ENV"; then
         # venv already exists
         echo "Using Python virtual environment: ${INVENTREE_PY_ENV}"
+        source ${INVENTREE_PY_ENV}/bin/activate
     else
-        # Setup a virtual environment (within the "data/env" directory)
+        # Setup a virtual environment (within the provided directory)
         echo "Running first time setup for python environment"
         python3 -m venv ${INVENTREE_PY_ENV} --system-site-packages --upgrade-deps
+
+        # Ensure invoke tool is installed locally
+        source ${INVENTREE_PY_ENV}/bin/activate
+        python3 -m pip install --ignore-installed --upgrade invoke
     fi
 
-    # Now activate the venv
-    source ${INVENTREE_PY_ENV}/bin/activate
 fi
 
 cd ${INVENTREE_HOME}