bug-1871345: Dev container improvements

.devcontainer/Dockerfile

@@ -2,6 +2,10 @@ FROM mcr.microsoft.com/devcontainers/python:3.11-bullseye@sha256:105bf6a63ab0252
 
 WORKDIR /app
 
+# Install Debian packages
+RUN apt-get update && \
+    apt-get install -y ripgrep
+
 # Install Python dependencies
 COPY requirements.txt /app/
 RUN pip install -U 'pip>=20' && \

.devcontainer/devcontainer.json

@@ -1,8 +1,7 @@
 {
   "name": "Tecken",
   "dockerComposeFile": [
-    "../docker-compose.yml",
-    "docker-compose.yml"
+    "../docker-compose.yml"
   ],
   "service": "devcontainer",
   "runServices": [

Makefile

@@ -7,12 +7,6 @@
 include .env
 export
 
-# Set these in the environment to override them. This is helpful for
-# development if you have file ownership problems because the user
-# in the container doesn't match the user on your host.
-USE_UID ?= 10001
-USE_GID ?= 10001
-
 DOCKER := $(shell which docker)
 DC=${DOCKER} compose
 
@@ -45,8 +39,7 @@ slick.sh:
 
 .PHONY: build
 build: .env  ## | Build docker images.
-	${DC} build --build-arg userid=${USE_UID} --build-arg groupid=${USE_GID} --progress plain base frontend
-	${DC} build --progress plain fakesentry ${SERVICES}
+	${DC} build --progress plain base frontend fakesentry ${SERVICES}
 	touch .docker-build
 
 .PHONY: setup
@@ -97,8 +90,8 @@ testshell: .env .docker-build  ## | Open shell in test environment.
 
 .PHONY: docs
 docs: .env .docker-build  ## | Build docs.
-	${DC} run --rm --user ${USE_UID} --no-deps web bash make -C docs/ clean
-	${DC} run --rm --user ${USE_UID} --no-deps web bash make -C docs/ html
+	${DC} run --rm --no-deps web bash make -C docs/ clean
+	${DC} run --rm --no-deps web bash make -C docs/ html
 
 .PHONY: lint
 lint: .env .docker-build  ## | Lint code.

docker-compose.yml

@@ -7,6 +7,9 @@ services:
     build:
       context: .
       dockerfile: docker/Dockerfile
+      args:
+        userid: ${USE_UID:-10001}
+        groupid: ${USE_GID:-10001}
     image: tecken:build
     env_file:
       - docker/config/local_dev.env
@@ -16,9 +19,6 @@ services:
   web:
     extends:
       service: base
-    depends_on:
-      - db
-      - redis-cache
     ports:
       - "${EXPOSE_TECKEN_PORT:-8000}:8000"
     links:
@@ -33,7 +33,7 @@ services:
     command: ["web", "--dev"]
 
   # Container specifically for running tests.
-  test:
+  test-ci:
     extends:
       service: base
     env_file:
@@ -43,19 +43,24 @@ services:
       - db
       - fakesentry
       - redis-cache
+      - localstack
+      - oidcprovider
+      - statsd
+
+  test:
+    extends:
+      service: test-ci
     volumes:
       - $PWD:/app
 
-  test-ci:
+  # Dev container https://containers.dev/, e.g. for VS Code
+  devcontainer:
     extends:
-      service: base
-    env_file:
-      - docker/config/local_dev.env
-      - docker/config/test.env
-    links:
-      - db
-      - fakesentry
-      - redis-cache
+      service: test
+    build:
+      dockerfile: .devcontainer/Dockerfile
+    image: tecken-devcontainer
+    entrypoint: ["sleep", "inf"]
 
   # Web container is a prod-like fully-functioning container.
   gunicorn:
@@ -68,10 +73,18 @@ services:
       - redis-cache
     command: web
 
-  frontend:
+  # Same as 'frontend' but no volumes or command
+  frontend-ci:
     build:
       context: .
       dockerfile: frontend/Dockerfile
+      args:
+        userid: ${USE_UID:-10001}
+        groupid: ${USE_GID:-10001}
+
+  frontend:
+    extends:
+      frontend-ci
     environment:
       - NODE_ENV=development
     ports:
@@ -81,12 +94,6 @@ services:
       - $PWD/frontend:/app
     command: start
 
-  # Same as 'frontend' but no volumes or command
-  frontend-ci:
-    build:
-      context: .
-      dockerfile: frontend/Dockerfile
-
   # https://hub.docker.com/_/postgres/
   db:
     image: postgres:12.7