From 4293afde6eadb39b947fb80cd85d10c4253fc6ec Mon Sep 17 00:00:00 2001 From: Ethan Ho Date: Mon, 18 Dec 2023 15:28:29 -0700 Subject: [PATCH 1/3] Add docker-in-docker feature to devcontainer Enables building and serving docs as described in docs/src/develop.md --- .devcontainer/devcontainer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 35b1d0835..2a5a10afc 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -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": { From a6c35337ec759e9bd37d2630d0f68d219b27538f Mon Sep 17 00:00:00 2001 From: Ethan Ho Date: Wed, 20 Dec 2023 07:10:49 -0700 Subject: [PATCH 2/3] Use Python 3.11 in devcontainer --- .devcontainer/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 1ee8ea148..9733d3c7c 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -12,7 +12,7 @@ services: context: . dockerfile: .devcontainer/Dockerfile args: - - PY_VER=${PY_VER:-3.8} + - PY_VER=${PY_VER:-3.11} - DISTRO=${DISTRO:-buster} volumes: From 93e76ab9dff53437bc22e1245571b0318e4bbf23 Mon Sep 17 00:00:00 2001 From: Ethan Ho Date: Wed, 20 Dec 2023 07:18:38 -0700 Subject: [PATCH 3/3] Update container and image name --- .devcontainer/docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index 9733d3c7c..50efa80b9 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -6,8 +6,8 @@ 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