From 53a000706ded6cdbdf306785ac61c4b0cf4795fc Mon Sep 17 00:00:00 2001
From: tschaffter <thomas.schaffter@gmail.com>
Date: Wed, 4 Dec 2024 00:17:28 +0000
Subject: [PATCH 1/4] Add Docker in Docker to the devcontainer

---
 .devcontainer/devcontainer.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 3746fd1..fe17278 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,7 +8,11 @@
     "ghcr.io/devcontainers/features/python:1.6.3": {
       "version": "3.12.0"
     },
-    "ghcr.io/devcontainers/features/aws-cli:1": {}
+    "ghcr.io/devcontainers/features/aws-cli:1": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:2.12.0": {
+      "version": "27.0.3",
+      "moby": false
+    }
   },
   "postCreateCommand": "./tools/setup.sh",
   "shutdownAction": "stopContainer"

From 681926f99be44892b822e652a4aa42e23a7cbf42 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Wed, 4 Dec 2024 17:40:09 +0000
Subject: [PATCH 2/4] add docs about docker

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index fce5714..aa71846 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,11 @@ tools can be installed by running:
 ./tools/setup.sh
 ```
 
+When developing outside the dev container, the following tools must be installed
+manually.
+
+- [Docker](https://docs.docker.com/engine/install/) >= v27
+
 Development requires the activation of the Python virtual environment:
 
 ```

From f7c208bea39d9e4469b8564a1d23f0cd2aa7d734 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Wed, 4 Dec 2024 17:59:06 +0000
Subject: [PATCH 3/4] forward local environment variables to the devcontainer

---
 .devcontainer/devcontainer.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fe17278..882d5ff 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,14 @@
 {
   "name": "AWS CDK & Python Development Environment",
   "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
+  "containerEnv": {
+    "ENV": "${localEnv:ENV}",
+    "SECRETS": "${localEnv:SECRETS}",
+    "AWS_ACCESS_KEY_ID": "${localEnv:AWS_ACCESS_KEY_ID}",
+    "AWS_SECRET_ACCESS_KEY": "${localEnv:AWS_SECRET_ACCESS_KEY}",
+    "AWS_SESSION_TOKEN": "${localEnv:AWS_SESSION_TOKEN}",
+    "AWS_REGION": "${localEnv:AWS_REGION}"
+  },
   "features": {
     "ghcr.io/devcontainers/features/node:1.5.0": {
       "version": "22.6.0"

From 372132ee57f4a58c332f688bae1881c6f0a0ccfc Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Wed, 4 Dec 2024 23:05:38 +0000
Subject: [PATCH 4/4] remove containerEnv

---
 .devcontainer/devcontainer.json | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 882d5ff..fe17278 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,14 +1,6 @@
 {
   "name": "AWS CDK & Python Development Environment",
   "image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
-  "containerEnv": {
-    "ENV": "${localEnv:ENV}",
-    "SECRETS": "${localEnv:SECRETS}",
-    "AWS_ACCESS_KEY_ID": "${localEnv:AWS_ACCESS_KEY_ID}",
-    "AWS_SECRET_ACCESS_KEY": "${localEnv:AWS_SECRET_ACCESS_KEY}",
-    "AWS_SESSION_TOKEN": "${localEnv:AWS_SESSION_TOKEN}",
-    "AWS_REGION": "${localEnv:AWS_REGION}"
-  },
   "features": {
     "ghcr.io/devcontainers/features/node:1.5.0": {
       "version": "22.6.0"