diff --git a/.devcontainer/devcontainer.json b/.devcontainer/default/devcontainer.json similarity index 97% rename from .devcontainer/devcontainer.json rename to .devcontainer/default/devcontainer.json index 98e10ef2..455028fa 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/default/devcontainer.json @@ -3,8 +3,8 @@ { "name": "ISIC", "dockerComposeFile": [ - "../docker-compose.yml", - "../docker-compose.override.yml" + "../../docker-compose.yml", + "../../docker-compose.override.yml" ], "service": "django", "overrideCommand": true, diff --git a/.gitignore b/.gitignore index 28b4085b..b259df3f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ isic/core/static/core/dist/ +# Local dev customizations +dev/local-setup.sh +docker-compose.local.yml + # VSCode settings .vscode/settings.json diff --git a/dev/django.Dockerfile b/dev/django.Dockerfile index b0b73b6d..9b158dfe 100644 --- a/dev/django.Dockerfile +++ b/dev/django.Dockerfile @@ -17,6 +17,9 @@ RUN apt-get update && \ USER vscode +# The glob ensures COPY doesn't fail when the file doesn't exist +COPY dev/local-setup.sh* /tmp/ +RUN if [ -f /tmp/local-setup.sh ]; then bash /tmp/local-setup.sh; fi RUN mkdir /home/vscode/uv