diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index aac3a70c16..977ce8b122 100755 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -4,6 +4,8 @@ ARG VARIANT="3.10-bullseye" FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT} +ARG WORKSPACE="/workspaces/InvenTree" + # [Choice] Node.js version: none, lts/*, 16, 14, 12, 10 ARG NODE_VERSION="none" RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi @@ -42,6 +44,6 @@ RUN pip install --disable-pip-version-check -U -r base_requirements.txt # preserve command history between container starts # Ref: https://code.visualstudio.com/remote/advancedcontainers/persist-bash-history # Folder will be created in 'postCreateCommand' in devcontainer.json as it's not preserved due to the bind mount -RUN echo "export PROMPT_COMMAND='history -a' && export HISTFILE=/workspaces/InvenTree/dev/commandhistory/.bash_history" >> "/home/vscode/.bashrc" +RUN echo "export PROMPT_COMMAND='history -a' && export HISTFILE=${WORKSPACE}/dev/commandhistory/.bash_history" >> "/home/vscode/.bashrc" -WORKDIR /workspaces/InvenTree +WORKDIR ${WORKSPACE} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e25892222a..8b13e7d7f5 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -11,7 +11,8 @@ // Use -bullseye variants on local on arm64/Apple Silicon. "VARIANT": "3.10-bullseye", // Options - "NODE_VERSION": "lts/*" + "NODE_VERSION": "lts/*", + "WORKSPACE": "${containerWorkspaceFolder}" } }, @@ -21,7 +22,7 @@ "vscode": { // Set *default* container specific settings.json values on container create. "settings": { - "python.defaultInterpreterPath": "/workspaces/InvenTree/dev/venv/bin/python", + "python.defaultInterpreterPath": "${containerWorkspaceFolder}/dev/venv/bin/python", "python.linting.enabled": true, "python.linting.pylintEnabled": false, "python.linting.flake8Enabled": true, @@ -55,7 +56,7 @@ }, // Use 'postCreateCommand' to run commands after the container is created. - "postCreateCommand": "./.devcontainer/postCreateCommand.sh", + "postCreateCommand": "./.devcontainer/postCreateCommand.sh ${containerWorkspaceFolder}", // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. "remoteUser": "vscode", @@ -69,22 +70,22 @@ "INVENTREE_DEBUG": "True", "INVENTREE_DEBUG_LEVEL": "INFO", "INVENTREE_DB_ENGINE": "sqlite3", - "INVENTREE_DB_NAME": "/workspaces/InvenTree/dev/database.sqlite3", - "INVENTREE_MEDIA_ROOT": "/workspaces/InvenTree/dev/media", - "INVENTREE_STATIC_ROOT": "/workspaces/InvenTree/dev/static", - "INVENTREE_BACKUP_DIR": "/workspaces/InvenTree/dev/backup", - "INVENTREE_CONFIG_FILE": "/workspaces/InvenTree/dev/config.yaml", - "INVENTREE_SECRET_KEY_FILE": "/workspaces/InvenTree/dev/secret_key.txt", + "INVENTREE_DB_NAME": "${containerWorkspaceFolder}/dev/database.sqlite3", + "INVENTREE_MEDIA_ROOT": "${containerWorkspaceFolder}/dev/media", + "INVENTREE_STATIC_ROOT": "${containerWorkspaceFolder}/dev/static", + "INVENTREE_BACKUP_DIR": "${containerWorkspaceFolder}/dev/backup", + "INVENTREE_CONFIG_FILE": "${containerWorkspaceFolder}/dev/config.yaml", + "INVENTREE_SECRET_KEY_FILE": "${containerWorkspaceFolder}/dev/secret_key.txt", "INVENTREE_PLUGINS_ENABLED": "True", - "INVENTREE_PLUGIN_DIR": "/workspaces/InvenTree/dev/plugins", - "INVENTREE_PLUGIN_FILE": "/workspaces/InvenTree/dev/plugins.txt", + "INVENTREE_PLUGIN_DIR": "${containerWorkspaceFolder}/dev/plugins", + "INVENTREE_PLUGIN_FILE": "${containerWorkspaceFolder}/dev/plugins.txt", // Python config "PIP_USER": "no", // used to load the venv into the PATH and activate it // Ref: https://stackoverflow.com/a/56286534 - "VIRTUAL_ENV": "/workspaces/InvenTree/dev/venv", - "PATH": "/workspaces/InvenTree/dev/venv/bin:${containerEnv:PATH}" + "VIRTUAL_ENV": "${containerWorkspaceFolder}/dev/venv", + "PATH": "${containerWorkspaceFolder}/dev/venv/bin:${containerEnv:PATH}" } } diff --git a/.devcontainer/postCreateCommand.sh b/.devcontainer/postCreateCommand.sh index ff5deb1552..e5e78d6b0c 100755 --- a/.devcontainer/postCreateCommand.sh +++ b/.devcontainer/postCreateCommand.sh @@ -1,22 +1,23 @@ #!/bin/bash +# Avoiding Dubious Ownership in Dev Containers for setup commands that use git +# Note that the local workspace directory is passed through as the first argument $1 +git config --global --add safe.directory $1 + # create folders -mkdir -p /workspaces/InvenTree/dev/{commandhistory,plugins} -cd /workspaces/InvenTree +mkdir -p $1/dev/{commandhistory,plugins} +cd $1 # create venv python3 -m venv dev/venv . dev/venv/bin/activate -# Avoiding Dubious Ownership in Dev Containers for setup commands that use git -git config --global --add safe.directory /workspaces/InvenTree - # setup InvenTree server pip install invoke -inv update -inv setup-dev +invoke update +invoke setup-dev # remove existing gitconfig created by "Avoiding Dubious Ownership" step -# so that it gets copyied from host to the container to have your global +# so that it gets copied from host to the container to have your global # git config in container rm -f /home/vscode/.gitconfig diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 951e2af546..8eb8c3ca13 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,52 +1,64 @@ { // See https://go.microsoft.com/fwlink/?LinkId=733558 // for the documentation about the tasks.json format + + // the problemMatchers should prevent vscode from asking how it should check the output + "version": "2.0.0", "tasks": [ { "label": "clean-settings", "type": "shell", "command": "inv clean-settings", + "problemMatcher": [], }, { "label": "delete-data", "type": "shell", "command": "inv delete-data", + "problemMatcher": [], }, { "label": "migrate", "type": "shell", "command": "inv migrate", + "problemMatcher": [], }, { "label": "server", "type": "shell", "command": "inv server", + "problemMatcher": [], }, { "label": "setup-dev", "type": "shell", "command": "inv setup-dev", + "problemMatcher": [], }, { "label": "setup-test", "type": "shell", "command": "inv setup-test --path dev/inventree-demo-dataset", + "problemMatcher": [], }, { "label": "superuser", "type": "shell", "command": "inv superuser", + "problemMatcher": [], }, { "label": "test", "type": "shell", "command": "inv test", + "problemMatcher": [], }, { "label": "update", "type": "shell", "command": "inv update", + "problemMatcher": [], }, ] } diff --git a/docs/docs/start/devcontainer.md b/docs/docs/start/devcontainer.md new file mode 100644 index 0000000000..a2242dfaf4 --- /dev/null +++ b/docs/docs/start/devcontainer.md @@ -0,0 +1,90 @@ +--- +title: Devcontainer +--- + +## Devcontainer + +[Devcontainers](https://code.visualstudio.com/docs/devcontainers/containers) are the easiest way to get into InvenTree development. You can either run them on your machine in vscode or use github codespaces. + +### Setup in vscode + +#### Prerequisites + +You need to make sure that you have the following tools installed before continuing. + +- [git](https://git-scm.com/downloads) is needed to clone the repository +- [docker](https://www.docker.com/products/docker-desktop/) is needed to run the devcontainer +- [vscode](https://code.visualstudio.com/Download) is needed to edit and debug code + +#### Setup/Installation + +1. Clone the repository (If you want to submit changes fork it and use the url to your fork in the next step) + ```bash + git clone https://github.com/inventree/InvenTree.git + ``` +2. open vscode, navigate to the extensions sidebar and search for `ms-vscode-remote.remote-containers`. Click on install. +3. open the cloned folder from above by clicking on `file > open folder` +4. vscode should now ask you if you'd like to reopen this folder in a devcontainer. Click `Reopen in Container`. If it shouldn't ask you open the command palette (CMD+Shift+P) and search for `Reopen in Container`. This can take a few minutes until the image is downloaded, build and setup with all dependencies. + +### Setup in codespaces + +Open [inventree/InvenTree](https://github.com/inventree/InvenTree) with your browser and click on `Code`, select the `codespaces` tab and click on create codespace on current branch. This may can take a few minutes until your inventree development environment is setup. + +!!! warning "Close the terminal" + The appearing terminal which says `Welcome to codespaces` is not using the virtual env. Close it and use a new terminal that will automatically connect to the venv for using commands. + +### Running tasks + +Tasks can help you executing scripts. You can run them by open the command panel (CMD+Shift+P) and search for `Run Task`. Then choose the desired task. + +#### Setup demo dataset + +If you need some demo test-data, run the `setup-test` task. This will import an `admin` user with the password `inventree`. For more info on what this dataset contains see [inventree/demo-dataset](https://github.com/inventree/demo-dataset). + +#### Setup a superuser + +If you only need a superuser, run the `superuser` task. It should prompt you for credentials. + +### Running InvenTree + +You can either only run InvenTree or use the integrated debugger for debugging. Goto the `Run and debug` side panel make sure `InvenTree Server` is selected. Click on the play button on the left. + +!!! tip "Debug with 3rd party" + Sometimes you need to debug also some 3rd party packages. Just select `python: Django - 3rd party` + +You can now set breakpoints and vscode will automatically pause execution if that point is hit. You can see all variables available in that context and evaluate some code with the debugger console at the bottom. Use the play or step buttons to continue execution. + +### Plugin development + +The easiest way for plugin developing is by using the InvenTree devcontainer. Just mount your plugin repository also into the devcontainer workspace and install it as pip editable package. + +1. To mount your plugin repo into the workspace, add this to your `.devcontainer/devcontainer.json` file. (Make sure that you don't commit it) + ```json + "mounts": [ + "source=/path/to/your/local/inventree-plugin,target=/workspaces/inventree-plugin,type=bind,consistency=cached" + ], + ``` +2. Add `/workspaces/inventree-plugin` to your vscode workspace folders by click on `File > Add folder to workspace…`. +3. Install your plugin as pip editable install by executing the following command in the venv. + ```bash + pip install -e /workspaces/inventree-plugin + ``` +4. Add InvenTree core code to Pylance IntelliSense path by adding the following file to your plugin repo `.vscode/settings.json` (Your path can be different depending on your setup): + ```json + { + "python.analysis.extraPaths": ["/workspaces/InvenTree/InvenTree"] + } + ``` + +Your plugin should now be activateable from the InvenTree settings. You can also use breakpoints for debugging. + +### Troubleshooting + +#### Your ssh-keys are not available in the devcontainer but are loaded to the active `ssh-agent` on macOS +Make sure you enabled full disk access on macOS for vscode, otherwise your ssh-keys are not available inside the container (Ref: [Automatically add SSH keys to ssh-agent [comment]](https://github.com/microsoft/vscode-remote-release/issues/4024#issuecomment-831671081)). + +#### You're not able to use your gpg-keys inside the devcontainer to sign commits on macOS +Make sure you have `gnupg` and `pinentry-mac` installed and set up correctly. Read this [medium post](https://medium.com/@jma/setup-gpg-for-git-on-macos-4ad69e8d3733) for more info on how to set it up correctly. + +#### Where are the database, media files, ... stored? +Backups, Commandhistory, media/static files, venv, plugin.txt, secret_key.txt, ... are stored in the `dev` folder. If you want to start with a clean setup, you can remove that folder, but be aware that this will delete everything you already setup in InvenTree. diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 2844e8d83b..f4c3690803 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -65,13 +65,15 @@ nav: - Configuration: start/config.md - Docker: - Introduction: start/docker.md - - Development: start/docker_dev.md - Production: start/docker_prod.md + - Development: start/docker_dev.md - Bare Metal: - Introduction: start/install.md - Installer: start/installer.md - - Development: start/development.md - Production: start/production.md + - Development: start/development.md + - Development: + - Devcontainer: start/devcontainer.md - Serving Files: start/serving_files.md - Data Backup: start/backup.md - Migrating Data: start/migrate.md