container-superposition 0.1.8 → 0.1.10

package/overlays/fuseki/verify.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+# Verification script for Apache Jena Fuseki overlay
+# Confirms Fuseki is running and responding to requests
+
+set -e
+
+FUSEKI_HOST="${FUSEKI_HOST:-fuseki}"
+FUSEKI_PORT="${FUSEKI_PORT:-3030}"
+FUSEKI_URL="http://${FUSEKI_HOST}:${FUSEKI_PORT}"
+
+echo "Verifying Apache Jena Fuseki overlay..."
+echo ""
+
+# Check curl is available
+echo "1. Checking curl availability..."
+if command -v curl &> /dev/null; then
+    echo "   curl found"
+else
+    echo "   curl not found - cannot verify Fuseki service"
+    exit 1
+fi
+
+# Check Fuseki ping endpoint
+echo ""
+echo "2. Checking Fuseki service at ${FUSEKI_URL}/\$/ping..."
+FUSEKI_READY=false
+for i in {1..15}; do
+    if curl -sf "${FUSEKI_URL}/\$/ping" &> /dev/null; then
+        echo "   Fuseki service is ready"
+        FUSEKI_READY=true
+        break
+    fi
+    sleep 2
+done
+
+if [ "$FUSEKI_READY" = false ]; then
+    echo "   Fuseki service not ready after 30 seconds"
+    exit 1
+fi
+
+# Check dataset exists
+DATASET="${FUSEKI_DATASET:-ds}"
+ADMIN_PASSWORD="${FUSEKI_ADMIN_PASSWORD:-admin}"
+echo ""
+echo "3. Checking dataset '${DATASET}' exists..."
+HTTP_STATUS=$(curl -s -o /dev/null -w "%{http_code}" \
+    -u "admin:${ADMIN_PASSWORD}" \
+    "${FUSEKI_URL}/\$/datasets/${DATASET}")
+
+if [ "$HTTP_STATUS" = "200" ]; then
+    echo "   Dataset '${DATASET}' found"
+else
+    echo "   Dataset '${DATASET}' not found (HTTP ${HTTP_STATUS}) - it may still be initializing"
+fi
+
+echo ""
+echo "Apache Jena Fuseki overlay verification complete"
+echo "Admin UI: ${FUSEKI_URL}"

package/overlays/gemini-cli/devcontainer.patch.json

@@ -1,3 +1,6 @@
 {
-    "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json"
+    "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
+    "postCreateCommand": {
+        "setup-gemini-cli": "bash .devcontainer/scripts/setup-gemini-cli.sh"
+    }
 }

package/overlays/go/overlay.yml

@@ -5,7 +5,12 @@ category: language
 supports: []
 requires: []
 suggests: []
-conflicts: []
+conflicts:
+    - mysql
+    - redpanda
+    - mongodb
+    - otel-demo-nodejs
+    - otel-demo-python
 tags:
     - language
     - go

package/overlays/grafana/devcontainer.patch.json

@@ -1,7 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
     "runServices": ["grafana"],
-    "_serviceOrder": 3,
     "forwardPorts": [3000],
     "portsAttributes": {
         "3000": {

package/overlays/grafana/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.8'
 services:
     grafana:
         image: grafana/grafana:${GRAFANA_VERSION:-latest}
+        restart: unless-stopped
         environment:
             - GF_SECURITY_ADMIN_USER=${GRAFANA_ADMIN_USER:-admin}
             - GF_SECURITY_ADMIN_PASSWORD=${GRAFANA_ADMIN_PASSWORD:-admin}
@@ -15,13 +16,18 @@ services:
             - '${GRAFANA_PORT:-3000}:3000'
         depends_on:
             - prometheus
-            - loki
-            - jaeger
         networks:
             - devnet
+        healthcheck:
+            test: ['CMD', 'wget', '-qO-', 'http://localhost:3000/api/health']
+            interval: 10s
+            timeout: 5s
+            retries: 5
+            start_period: 20s
 
 volumes:
     grafana_data:
 
 networks:
     devnet:
+        name: devnet

package/overlays/grafana/overlay.yml

@@ -11,7 +11,11 @@ suggests:
     - jaeger
     - tempo
     - promtail
-conflicts: []
+conflicts:
+    - open-webui
+    - nodejs
+    - bun
+    - rust
 tags:
     - observability
     - ui
@@ -24,3 +28,4 @@ ports:
       path: /
       onAutoForward: openBrowser
 order: 3
+serviceOrder: 3

package/overlays/jaeger/.env.example

@@ -5,3 +5,14 @@ JAEGER_VERSION=latest
 JAEGER_UI_PORT=16686
 JAEGER_OTLP_GRPC_PORT=4317
 JAEGER_OTLP_HTTP_PORT=4318
+
+# OpenTelemetry SDK defaults for apps running in the devcontainer
+# These are pre-set in the devcontainer via remoteEnv; see devcontainer.patch.json
+# Customize after generation by editing remoteEnv in .devcontainer/devcontainer.json
+OTEL_SERVICE_NAME=my-service
+OTEL_SERVICE_VERSION=0.1.0
+OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4317
+OTEL_EXPORTER_OTLP_PROTOCOL=grpc
+OTEL_RESOURCE_ATTRIBUTES=deployment.environment=development
+OTEL_TRACES_SAMPLER=always_on
+OTEL_TRACES_EXPORTER=otlp

package/overlays/jaeger/README.md

@@ -33,10 +33,35 @@ graph TD
 ### Ports
 
 - `16686` - Jaeger UI (web interface)
-- `4317` - OTLP gRPC receiver (when used without otel-collector)
-- `4318` - OTLP HTTP receiver (when used without otel-collector)
+- `4317` - OTLP gRPC receiver (internal Docker network only; not published to host)
+- `4318` - OTLP HTTP receiver (internal Docker network only; not published to host)
 
-⚠️ **Note:** When using with **otel-collector**, OTLP ports (4317/4318) are not exposed to avoid conflicts. Send telemetry to otel-collector, which forwards to Jaeger.
+⚠️ **Note:** When using with **otel-collector**, send telemetry to `otel-collector:4317` instead — the collector forwards to Jaeger internally.
+
+### Pre-configured OpenTelemetry Environment
+
+The devcontainer is pre-configured with OTEL environment variables so that any properly-instrumented app running inside the devcontainer sends traces to Jaeger automatically:
+
+| Variable                      | Default value                        | Purpose                                |
+| ----------------------------- | ------------------------------------ | -------------------------------------- |
+| `OTEL_SERVICE_NAME`           | `my-service`                         | Service name shown in Jaeger UI        |
+| `OTEL_SERVICE_VERSION`        | `0.1.0`                              | Service version in resource attributes |
+| `OTEL_EXPORTER_OTLP_ENDPOINT` | `http://jaeger:4317`                 | OTLP gRPC endpoint (Docker network)    |
+| `OTEL_EXPORTER_OTLP_PROTOCOL` | `grpc`                               | Transport protocol                     |
+| `OTEL_RESOURCE_ATTRIBUTES`    | `deployment.environment=development` | Additional resource metadata           |
+| `OTEL_TRACES_SAMPLER`         | `always_on`                          | Capture every trace in development     |
+| `OTEL_TRACES_EXPORTER`        | `otlp`                               | Export traces via OTLP                 |
+
+These values are set via `remoteEnv` in `devcontainer.json`. To override them for your project, edit `.devcontainer/devcontainer.json` after generation and update the `remoteEnv` block, then rebuild the container:
+
+```json
+"remoteEnv": {
+    "OTEL_SERVICE_NAME": "my-app",
+    "OTEL_SERVICE_VERSION": "1.0.0"
+}
+```
+
+When the **otel-collector** overlay is also selected, `OTEL_EXPORTER_OTLP_ENDPOINT` is automatically set to `http://otel-collector:4317` (otel-collector overlay is applied after jaeger and overrides this value).
 
 ### Environment Variables
 
@@ -74,12 +99,16 @@ container-superposition --port-offset 100
 
 ## Accessing Jaeger UI
 
-Once your devcontainer starts, open your browser to:
+Once your devcontainer starts, VS Code automatically opens <http://localhost:16686> in your browser (via `onAutoForward: openBrowser`). You can also open it manually:
 
 ```
 http://localhost:16686
 ```
 
+Port `16686` is published by the `jaeger` Docker Compose service to your local machine, so it is accessible both from the host and from within the devcontainer via `http://jaeger:16686`.
+
+The `devcontainer` service has `depends_on: jaeger: condition: service_healthy`, so Docker Compose waits for Jaeger to pass its healthcheck before starting the devcontainer. This ensures the UI is reachable by the time VS Code opens the browser.
+
 ### UI Features
 
 **1. Search Traces**

package/overlays/jaeger/devcontainer.patch.json

@@ -1,12 +1,20 @@
 {
     "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
     "runServices": ["jaeger"],
-    "_serviceOrder": 1,
     "forwardPorts": [16686],
     "portsAttributes": {
         "16686": {
             "label": "Jaeger UI",
             "onAutoForward": "openBrowser"
         }
+    },
+    "remoteEnv": {
+        "OTEL_SERVICE_NAME": "my-service",
+        "OTEL_SERVICE_VERSION": "0.1.0",
+        "OTEL_EXPORTER_OTLP_ENDPOINT": "http://jaeger:4317",
+        "OTEL_EXPORTER_OTLP_PROTOCOL": "grpc",
+        "OTEL_RESOURCE_ATTRIBUTES": "deployment.environment=development",
+        "OTEL_TRACES_SAMPLER": "always_on",
+        "OTEL_TRACES_EXPORTER": "otlp"
     }
 }

package/overlays/jaeger/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.8'
 services:
     jaeger:
         image: jaegertracing/all-in-one:${JAEGER_VERSION:-latest}
+        restart: unless-stopped
         environment:
             - COLLECTOR_OTLP_ENABLED=true
         ports:
@@ -12,6 +13,22 @@ services:
             # Apps should send telemetry to otel-collector, which forwards to Jaeger if both are used
         networks:
             - devnet
+        healthcheck:
+            test:
+                [
+                    'CMD-SHELL',
+                    'wget --no-verbose --tries=1 --spider http://localhost:14269/ || exit 1',
+                ]
+            interval: 5s
+            timeout: 5s
+            retries: 10
+            start_period: 10s
+
+    devcontainer:
+        depends_on:
+            jaeger:
+                condition: service_healthy
 
 networks:
     devnet:
+        name: devnet

package/overlays/jaeger/overlay.yml

@@ -19,16 +19,5 @@ ports:
       description: Jaeger UI
       path: /
       onAutoForward: openBrowser
-    - port: 14250
-      service: jaeger
-      protocol: grpc
-      description: Jaeger gRPC receiver
-      onAutoForward: ignore
-    - port: 14268
-      service: jaeger
-      protocol: http
-      description: Jaeger HTTP receiver
-      onAutoForward: ignore
 order: 1
-imports:
-    - .shared/otel/instrumentation.env
+serviceOrder: 1

package/overlays/java/overlay.yml

@@ -5,7 +5,12 @@ category: language
 supports: []
 requires: []
 suggests: []
-conflicts: []
+conflicts:
+    - mysql
+    - redpanda
+    - mongodb
+    - otel-demo-nodejs
+    - otel-demo-python
 tags:
     - language
     - java

package/overlays/jupyter/docker-compose.yml

@@ -21,3 +21,4 @@ volumes:
 
 networks:
     devnet:
+        name: devnet

package/overlays/jupyter/overlay.yml

@@ -8,6 +8,7 @@ requires:
     - python
 suggests: []
 conflicts: []
+serviceOrder: 3
 tags:
     - language
     - jupyter

package/overlays/keycloak/devcontainer.patch.json

@@ -1,7 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
     "runServices": ["keycloak"],
-    "_serviceOrder": 10,
     "forwardPorts": [8180],
     "portsAttributes": {
         "8180": {

package/overlays/keycloak/docker-compose.yml

@@ -32,3 +32,4 @@ services:
 
 networks:
     devnet:
+        name: devnet

package/overlays/keycloak/overlay.yml

@@ -8,6 +8,7 @@ requires:
     - postgres
 suggests: []
 conflicts: []
+serviceOrder: 2
 tags:
     - dev
     - auth
@@ -21,3 +22,17 @@ ports:
       description: Keycloak admin console and auth endpoints
       path: /
       onAutoForward: openBrowser
+parameters:
+    KEYCLOAK_VERSION:
+        description: Keycloak image version tag
+        default: '26.0'
+    KEYCLOAK_PORT:
+        description: Host port mapped to Keycloak HTTP (8180 inside container)
+        default: '8180'
+    KEYCLOAK_ADMIN:
+        description: Keycloak initial admin username
+        default: admin
+    KEYCLOAK_ADMIN_PASSWORD:
+        description: Keycloak initial admin password
+        default: admin
+        sensitive: true

package/overlays/localstack/docker-compose.yml

@@ -23,3 +23,4 @@ volumes:
 
 networks:
     devnet:
+        name: devnet

package/overlays/localstack/overlay.yml

@@ -7,7 +7,25 @@ supports:
 requires: []
 suggests:
     - aws-cli
-conflicts: []
+conflicts:
+    - minio
+serviceOrder: 0
+parameters:
+    LOCALSTACK_VERSION:
+        description: LocalStack image version tag
+        default: latest
+    LOCALSTACK_EDGE_PORT:
+        description: Host port mapped to LocalStack edge (4566 inside container)
+        default: '4566'
+    LOCALSTACK_S3_PORT:
+        description: Host port mapped to LocalStack S3 legacy endpoint (4571 inside container)
+        default: '4571'
+    LOCALSTACK_SERVICES:
+        description: Comma-separated list of AWS services to enable
+        default: s3,sqs,sns,dynamodb,lambda,cloudformation
+    LOCALSTACK_DEBUG:
+        description: Enable LocalStack debug logging (0 or 1)
+        default: '0'
 tags:
     - cloud
     - aws

package/overlays/loki/devcontainer.patch.json

@@ -1,7 +1,6 @@
 {
     "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
     "runServices": ["loki"],
-    "_serviceOrder": 1,
     "forwardPorts": [3100],
     "portsAttributes": {
         "3100": {

package/overlays/loki/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.8'
 services:
     loki:
         image: grafana/loki:${LOKI_VERSION:-latest}
+        restart: unless-stopped
         command: -config.file=/etc/loki/loki-config.yaml
         volumes:
             - ./loki-config-loki.yaml:/etc/loki/loki-config.yaml
@@ -10,9 +11,16 @@ services:
             - '${LOKI_PORT:-3100}:3100'
         networks:
             - devnet
+        healthcheck:
+            test: ['CMD', 'wget', '-qO-', 'http://localhost:3100/ready']
+            interval: 10s
+            timeout: 5s
+            retries: 5
+            start_period: 15s
 
 volumes:
     loki_data:
 
 networks:
     devnet:
+        name: devnet

package/overlays/loki/overlay.yml

@@ -20,3 +20,4 @@ ports:
       path: /
       onAutoForward: notify
 order: 1
+serviceOrder: 1

package/overlays/mailpit/docker-compose.yml

@@ -15,3 +15,4 @@ services:
 
 networks:
     devnet:
+        name: devnet

package/overlays/mailpit/overlay.yml

@@ -7,6 +7,7 @@ supports:
 requires: []
 suggests: []
 conflicts: []
+serviceOrder: 0
 tags:
     - dev
     - email

package/overlays/minio/devcontainer.patch.json

@@ -24,7 +24,7 @@
         "MINIO_ROOT_PASSWORD": "minioadmin",
         "AWS_ACCESS_KEY_ID": "minioadmin",
         "AWS_SECRET_ACCESS_KEY": "minioadmin",
-        "AWS_REGION": "us-east-1",
+        "AWS_DEFAULT_REGION": "us-east-1",
         "S3_ENDPOINT": "http://minio:9000"
     }
 }

package/overlays/minio/docker-compose.yml

@@ -26,3 +26,4 @@ volumes:
 
 networks:
     devnet:
+        name: devnet

package/overlays/minio/overlay.yml

@@ -5,8 +5,29 @@ category: database
 supports:
     - compose
 requires: []
-suggests: []
-conflicts: []
+suggests:
+    - prometheus
+    - grafana
+conflicts:
+    - localstack
+serviceOrder: 0
+parameters:
+    MINIO_VERSION:
+        description: MinIO image version tag
+        default: latest
+    MINIO_API_PORT:
+        description: Host port mapped to MinIO S3 API (9000 inside container)
+        default: '9000'
+    MINIO_CONSOLE_PORT:
+        description: Host port mapped to MinIO web console (9001 inside container)
+        default: '9001'
+    MINIO_ROOT_USER:
+        description: MinIO root username (access key)
+        default: minioadmin
+    MINIO_ROOT_PASSWORD:
+        description: MinIO root password (secret key)
+        default: minioadmin
+        sensitive: true
 tags:
     - database
     - storage

package/overlays/mkdocs/devcontainer.patch.json

@@ -7,11 +7,7 @@
     },
     "customizations": {
         "vscode": {
-            "extensions": [
-                "yzhang.markdown-all-in-one",
-                "DavidAnson.vscode-markdownlint",
-                "bierner.markdown-mermaid"
-            ]
+            "extensions": ["bierner.markdown-mermaid"]
         }
     },
     "forwardPorts": [8000],

package/overlays/mkdocs/overlay.yml

@@ -1,7 +1,7 @@
 id: mkdocs
 name: MkDocs
 description: Material for MkDocs - professional documentation generator
-category: language
+category: dev
 supports: []
 requires:
     - python
@@ -12,5 +12,7 @@ tags:
     - documentation
     - mkdocs
     - python
+imports:
+    - .shared/vscode/markdown-extensions.json
 ports:
     - 8000

package/overlays/mkdocs2/devcontainer.patch.json

@@ -2,11 +2,7 @@
     "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.base.schema.json",
     "customizations": {
         "vscode": {
-            "extensions": [
-                "yzhang.markdown-all-in-one",
-                "DavidAnson.vscode-markdownlint",
-                "bierner.markdown-mermaid"
-            ]
+            "extensions": ["bierner.markdown-mermaid"]
         }
     },
     "forwardPorts": [8000],

package/overlays/mkdocs2/overlay.yml

@@ -13,5 +13,7 @@ tags:
     - documentation
     - mkdocs
     - python
+imports:
+    - .shared/vscode/markdown-extensions.json
 ports:
     - 8000

package/overlays/mongodb/docker-compose.yml

@@ -19,6 +19,7 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+            start_period: 20s
 
     mongo-express:
         image: mongo-express:${MONGO_EXPRESS_VERSION:-latest}
@@ -42,3 +43,4 @@ volumes:
 
 networks:
     devnet:
+        name: devnet

package/overlays/mongodb/overlay.yml

@@ -5,8 +5,32 @@ category: database
 supports:
     - compose
 requires: []
-suggests: []
-conflicts: []
+suggests:
+    - prometheus
+    - grafana
+conflicts:
+    - redpanda
+    - otel-demo-python
+    - go
+    - java
+serviceOrder: 0
+parameters:
+    MONGODB_VERSION:
+        description: MongoDB image version tag
+        default: '8'
+    MONGODB_PORT:
+        description: Host port mapped to MongoDB (27017 inside container)
+        default: '27017'
+    MONGO_EXPRESS_PORT:
+        description: Host port mapped to Mongo Express (8081 inside container)
+        default: '8081'
+    MONGODB_USER:
+        description: MongoDB root username
+        default: root
+    MONGODB_PASSWORD:
+        description: MongoDB root password
+        default: example
+        sensitive: true
 tags:
     - database
     - nosql

package/overlays/mysql/docker-compose.yml

@@ -30,6 +30,7 @@ services:
             interval: 10s
             timeout: 5s
             retries: 5
+            start_period: 30s
 
     phpmyadmin:
         image: phpmyadmin:${PHPMYADMIN_VERSION:-latest}
@@ -53,3 +54,4 @@ volumes:
 
 networks:
     devnet:
+        name: devnet

package/overlays/mysql/overlay.yml

@@ -5,8 +5,42 @@ category: database
 supports:
     - compose
 requires: []
-suggests: []
-conflicts: []
+suggests:
+    - prometheus
+    - grafana
+conflicts:
+    - redpanda
+    - nodejs
+    - bun
+    - go
+    - java
+    - dotnet
+    - otel-demo-nodejs
+serviceOrder: 0
+parameters:
+    MYSQL_VERSION:
+        description: MySQL image version tag
+        default: '8'
+    MYSQL_PORT:
+        description: Host port mapped to MySQL (3306 inside container)
+        default: '3306'
+    PHPMYADMIN_PORT:
+        description: Host port mapped to phpMyAdmin (80 inside container)
+        default: '8080'
+    MYSQL_DATABASE:
+        description: Name of the database to create
+        default: devdb
+    MYSQL_USER:
+        description: MySQL user name
+        default: devuser
+    MYSQL_PASSWORD:
+        description: MySQL user password
+        default: devpassword
+        sensitive: true
+    MYSQL_ROOT_PASSWORD:
+        description: MySQL root password
+        default: rootpassword
+        sensitive: true
 tags:
     - database
     - sql

package/overlays/nats/docker-compose.yml

@@ -29,3 +29,4 @@ volumes:
 
 networks:
     devnet:
+        name: devnet