Skip to content
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

PLAT-142: Fix dev container follow-up #1144

Merged
merged 6 commits into from
Jan 2, 2024
Merged

PLAT-142: Fix dev container follow-up #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4293afd
Add docker-in-docker feature to devcontainer
ethho Dec 18, 2023
015443d
Merge branch 'dev-tests-cleanup' into fix-dev-container
ethho Dec 19, 2023
a6c3533
Use Python 3.11 in devcontainer
ethho Dec 20, 2023
93e76ab
Update container and image name
ethho Dec 20, 2023
2e37836
Merge branch 'dev-tests-cleanup' into fix-dev-container
ethho Jan 2, 2024
43598c9
Merge branch 'dev-tests' into fix-dev-container
ethho Jan 2, 2024
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
1 change: 1 addition & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"onCreateCommand": "python3 -m pip install -e .",
"features": {
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
},
// Configure tool-specific properties.
"customizations": {
Expand Down
6 changes: 3 additions & 3 deletions .devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ services:
# folder. Note that the path of the Dockerfile and context is relative to the *primary*
# docker-compose.yml file (the first in the devcontainer.json "dockerComposeFile"
# array). The sample below assumes your primary file is in the root of your project.
container_name: devcontainer
image: devcontainer
container_name: datajoint-python-devcontainer
image: datajoint/datajoint-python-devcontainer:${PY_VER:-3.11}-${DISTRO:-buster}
build:
context: .
dockerfile: .devcontainer/Dockerfile
args:
- PY_VER=${PY_VER:-3.8}
- PY_VER=${PY_VER:-3.11}
- DISTRO=${DISTRO:-buster}

volumes:
Expand Down