From b653ff00b2506157b3d0f0738577c34a0cb5721c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <jmm@yavook.de>
Date: Sat, 30 Dec 2023 18:24:38 +0100
Subject: [PATCH] devcontainer features instead of Dockerfile

---
 .devcontainer/Dockerfile        | 44 ---------------------------------
 .devcontainer/devcontainer.json | 18 ++++++--------
 .vscode/settings.json           |  2 +-
 3 files changed, 9 insertions(+), 55 deletions(-)
 delete mode 100644 .devcontainer/Dockerfile

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 23af0d5..0000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-# See here for image contents: https://github.com/devcontainers/images/blob/main/src/python/.devcontainer/Dockerfile
-
-# [Choice] Python version (use -bookworm or -bullseye variants on local arm64/Apple Silicon): 
-#  - 3, 3.12, 3.11, 3.10, 3.9, 3.8
-#  - 3-bookworm, 3.12-bookworm, 3.11-bookworm, 3.10-bookworm, 3.9-bookworm, 3.8-bookworm
-#  - 3-bullseye, 3.12-bullseye, 3.11-bullseye, 3.10-bullseye, 3.9-bullseye, 3.8-bullseye
-#  - 3-buster, 3.12-buster, 3.11-buster, 3.10-buster, 3.9-buster, 3.8-buster
-ARG VARIANT="3.12"
-FROM mcr.microsoft.com/vscode/devcontainers/python:1-${VARIANT}
-
-# Add "Poetry": https://python-poetry.org
-ARG POETRY_HOME="/usr/local"
-ENV POETRY_HOME="${POETRY_HOME}"
-RUN set -ex; \
-    \
-    curl -sSL https://install.python-poetry.org | python3 -; \
-    poetry self add poetry-plugin-up;
-
-# [Choice] Node.js version: none, lts/*, 18, 16, 14, 12, 10
-ARG NODE_VERSION="none"
-RUN set -ex; \
-    \
-    if [ "${NODE_VERSION}" != "none" ]; then \
-        su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; \
-    fi
-
-# [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
-# COPY requirements.txt /tmp/pip-tmp/
-# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
-#    && rm -rf /tmp/pip-tmp
-
-# [Optional] Uncomment this section to install additional OS packages.
-# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
-#     && apt-get -y install --no-install-recommends <your-package-list-here>
-
-RUN set -ex; \
-    \
-    export DEBIAN_FRONTEND=noninteractive; \
-    apt-get update; apt-get install --yes --no-install-recommends \
-        git-flow \
-    ; rm -rf /var/lib/apt/lists/*;
-
-# [Optional] Uncomment this line to install global node packages.
-# RUN su vscode -c "source /usr/local/share/nvm/nvm.sh && npm install -g <your-package-here>" 2>&1
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index feb8d70..2f65210 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,16 +2,13 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
 	"name": "Python 3",
-	"build": {
-		"dockerfile": "Dockerfile",
-		"context": "..",
-		"args": {
-			// Update 'VARIANT' to pick a Python version.
-			// Append -bookworm, -bullseye or -buster to pin to an OS version.
-			// Use -bookworm or -bullseye variants on arm64/Apple Silicon.
-			"VARIANT": "3.12",
-			// Options
-			"NODE_VERSION": "none"
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"image": "mcr.microsoft.com/vscode/devcontainers/python:1-3.12-bookworm",
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers-contrib/features/poetry:2": {},
+		"ghcr.io/devcontainers-contrib/features/apt-get-packages:1": {
+			"packages": "git-flow"
 		}
 	},
 	"containerEnv": {
@@ -38,6 +35,7 @@
 			]
 		}
 	},
+	"postCreateCommand": "sudo /usr/local/py-utils/bin/poetry self add poetry-plugin-up",
 	// Use 'postStartCommand' to run commands after the container is started.
 	"postStartCommand": "poetry install"
 	// Features to add to the dev container. More info: https://containers.dev/features.
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1602552..3a2612b 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,7 +5,7 @@
         "editor.defaultFormatter": "ms-python.black-formatter"
     },
     "editor.codeActionsOnSave": {
-        "source.organizeImports": true
+        "source.organizeImports": "explicit"
     },
     "git.closeDiffOnOperation": true,
     "python.analysis.typeCheckingMode": "basic",