cleanup/modernize devcontainers

api/.devcontainer/Dockerfile

@@ -1,45 +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-bookworm"
-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 \
-        git-lfs \
-    ; 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

api/.devcontainer/devcontainer.json

@@ -2,9 +2,19 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/python
 {
 	"name": "Advent22 API",
-	"dockerComposeFile": "docker-compose.yml",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-	"service": "api",
+	"image": "mcr.microsoft.com/vscode/devcontainers/python:1-3.11-bookworm",
-	"workspaceFolder": "/workspaces/advent22/${localWorkspaceFolderBasename}",
+	// 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, git-lfs"
+		},
+		"ghcr.io/itsmechlark/features/redis-server:1": {}
+	},
+	"containerEnv": {
+		"TZ": "Europe/Berlin"
+	},
 	// Configure tool-specific properties.
 	"customizations": {
 		// Configure properties specific to VS Code.
@@ -26,6 +36,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.

api/.devcontainer/docker-compose.yml

@@ -1,32 +0,0 @@
-version: "3.8"
-
-services:
-  api:
-    build:
-      context: "."
-      dockerfile: "Dockerfile"
-      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 local on arm64/Apple Silicon.
-        VARIANT: "3.11-bookworm"
-        NODE_VERSION: "none"
-
-    environment:
-      TZ: "Europe/Berlin"
-
-    volumes:
-      - "../..:/workspaces/advent22:cached"
-    
-    # Overrides default command so things don't shut down after the process ends.
-    command: "sleep infinity"
-
-    # Runs app on the same network as the redis container, allows "forwardPorts" in devcontainer.json function.
-    network_mode: "service:redis"
-
-    # Use "forwardPorts" in **devcontainer.json** to forward an app port locally. 
-    # (Adding the "ports" property to this file will not forward from a Codespace.)
-
-  redis:
-    image: "redis:7"
-    restart: "unless-stopped"

api/.env

@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME="advent22_api"

api/.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",

api/advent22_api/core/settings.py

@@ -36,7 +36,7 @@ class RedisSettings(BaseModel):
     Connection to a redis server.
     """
 
-    host: str = "redis"
+    host: str = "localhost"
     port: int = 6379
     db: int = 0
     protocol: int = 3

ui/.devcontainer/Dockerfile

@@ -1,24 +0,0 @@
-# [Choice] Node.js version (use -bullseye variants on local arm64/Apple Silicon): 18, 16, 14, 18-bullseye, 16-bullseye, 14-bullseye, 18-buster, 16-buster, 14-buster
-ARG VARIANT=16-bullseye
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}
-
-# [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 \
-        git-lfs \
-    ; rm -rf /var/lib/apt/lists/*; \
-    su node -c "git lfs install"
-
-# [Optional] Uncomment if you want to install an additional version of node using nvm
-# ARG EXTRA_NODE_VERSION=10
-# RUN su node -c "source /usr/local/share/nvm/nvm.sh && nvm install ${EXTRA_NODE_VERSION}"
-
-# [Optional] Uncomment if you want to install more global node modules
-# RUN su node -c "npm install -g <your-package-list-here>"
-RUN su node -c "yarn global add @vue/cli"

ui/.devcontainer/devcontainer.json

@@ -2,14 +2,14 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/javascript-node
 {
 	"name": "Advent22 UI",
-	"build": {
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-		"dockerfile": "Dockerfile",
+	"image": "mcr.microsoft.com/vscode/devcontainers/javascript-node:0-18-bullseye",
-		// Update 'VARIANT' to pick a Node version: 18, 16, 14.
+	// Features to add to the dev container. More info: https://containers.dev/features.
-		// Append -bullseye or -buster to pin to an OS version.
+	"features": {
-		// Use -bullseye variants on local arm64/Apple Silicon.
+		"ghcr.io/devcontainers-contrib/features/apt-get-packages:1": {
-		"args": {
+			"packages": "git-flow, git-lfs"
-			"VARIANT": "18-bullseye"
+		},
-		}
+		"ghcr.io/devcontainers-contrib/features/vue-cli:2": {}
 	},
 	// Configure tool-specific properties.
 	"customizations": {

ui/.vscode/settings.json

@@ -10,7 +10,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true
+    "source.organizeImports": "explicit"
   },
   "git.closeDiffOnOperation": true,
   "editor.tabSize": 2,