Almost working devcontainers

.devcontainer.json

@@ -2,9 +2,12 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/javascript-node-postgres
 {
   "name": "Bun & Postgres",
-  "dockerComposeFile": "docker-compose.yml",
-  "service": "app",
-  "workspaceFolder": "/workspaces/${localWorkspaceFolderBasename}",
+  "dockerComposeFile": [
+    "docker/docker-compose.yml",
+    "docker/docker-compose.workspace.yml"
+  ],
+  "service": "workspace",
+  "workspaceFolder": "/app",
   // Features to add to the dev container. More info: https://containers.dev/features.
   "features": {
     "ghcr.io/devcontainers/features/github-cli:1": {},
@@ -16,14 +19,6 @@
     "ghcr.io/itsmechlark/features/postgresql:1.3.3": {}
   },
   "waitFor": "onCreateCommand",
-  "updateContentCommand": "bun i",
-  "postAttachCommand": {
-    "app": "bun dev",
-    "studio": "bun db:studio",
-    "docs": "bun docs"
-  },
-  // "postCreateCommand": "bun db:migrate && bun db:seed",
-  "postCreateCommand": "./scripts/create-db.sh",
   "customizations": {
     "vscode": {
       "extensions": [

docker/.env

@@ -0,0 +1,10 @@
+# This is needed for devcontainers. We can't specify the .env files in the devcontainer.json file
+# so we need to rely on docker compose to pick up this file by default...
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_DB=medium
+POSTGRES_HOST=0.0.0.0
+POSTGRES_PORT=5432
+JWT_SECRET=supersecretkey
+JWT_ALGORITHM=HS256
+APP_PORT=3000

docker/Dockerfile

@@ -0,0 +1,13 @@
+FROM oven/bun:1.0.6-slim
+
+WORKDIR /app
+
+RUN apt-get update && \
+    apt-get upgrade -y && \
+    apt-get install -y git
+
+COPY package.json /app/package.json
+COPY bun.lockb /app/bun.lockb
+
+RUN bun install
+

docker/docker-compose.workspace.yml

@@ -0,0 +1,13 @@
+version: '3.8'
+
+services:
+  workspace:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
+    restart: unless-stopped
+    command: ["sleep", "infinity"]
+    volumes:
+      - ..:/app
+
+

docker/docker-compose.yml

@@ -0,0 +1,57 @@
+version: '3.8'
+
+x-common:
+  &commmon
+  build:
+    context: ..
+    dockerfile: docker/Dockerfile
+  depends_on:
+    db:
+      condition: service_healthy
+  env_file:
+    - ../environments/local/.env.db
+    - ../environments/local/.env.app
+  environment:
+    - POSTGRES_HOST=db
+    - POSTGRES_PORT=${POSTGRES_PORT}
+  volumes:
+    - ..:/app
+
+
+services:
+  db:
+    image: postgres:16
+    restart: unless-stopped
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=${POSTGRES_DB}
+      - POSTGRES_PORT=${POSTGRES_PORT}
+    healthcheck:
+      test: ["CMD", "pg_isready", "-U", "${POSTGRES_USER}"]
+      interval: 5s
+      timeout: 30s
+      retries: 10
+    ports:
+      - ${POSTGRES_PORT}:${POSTGRES_PORT}
+
+  db-init:
+    <<: *commmon
+    command: ["bun", "db:migrate", "&&", "bun", "db:seed"]
+    restart: no
+
+  app:
+    <<: *commmon
+    restart: unless-stopped
+    command: ["bun", "dev"]
+    depends_on:
+      db-init:
+        condition: service_completed_successfully
+    ports:
+      - ${APP_PORT}:${APP_PORT}
+
+volumes:
+  postgres-data:
+

environments/local/.env.app

@@ -0,0 +1,3 @@
+JWT_SECRET=supersecretkey
+JWT_ALGORITHM=HS256
+APP_PORT=3000

.env → environments/local/.env.db

@@ -3,6 +3,4 @@ POSTGRES_PASSWORD=postgres
 POSTGRES_DB=medium
 POSTGRES_HOST=0.0.0.0
 POSTGRES_PORT=5432
-JWT_SECRET=supersecretkey
-JWT_ALGORITHM=HS256
-APP_PORT=3000
+

scripts/create-start-container-with-env.sh

@@ -3,22 +3,24 @@
 # this script extends docker-compose up by supporting .env files in the same way as bun
 # see: https://bun.sh/docs/runtime/env#setting-environment-variables
 
-# Default env file
-env_file=".env"
+current_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
+cd "$current_path/.."
+
+
+env_prefix="environments"
+# Default env folder
+env_folder="$env_prefix/local"
 
 # Determine which env file to use based on NODE_ENV
 if [ "$NODE_ENV" == "production" ]; then
-  env_file=".env.production"
+  env_folder="$env_prefix/production"
 elif [ "$NODE_ENV" == "development" ]; then
-  env_file=".env.development"
+  env_folder="$env_prefix/development"
 elif [ "$NODE_ENV" == "test" ]; then
-  env_file=".env.test"
+  env_folder="$env_prefix/test"
 fi
 
-# If .env.local exists, use that instead
-if [ -f ".env.local" ]; then
-  env_file=".env.local"
-fi
+
 
 # Run docker-compose with the selected env file and pass along any arguments
-docker-compose --env-file $env_file up "$@"
+docker-compose --env-file "$env_folder/.env.db" --env-file "$env_folder/.env.app" -f docker/docker-compose.yml up "$@"