Skip to content

Allow local modifications to docker/docker-compose #1405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danlamanna merged 1 commit into from
Feb 17, 2026
Merged

Allow local modifications to docker/docker-compose #1405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .devcontainer/devcontainer.json → .devcontainer/default/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 3 additions & 0 deletions dev/django.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down