update dev services for apple containers

dev-services/docker-compose.yaml

@@ -2,7 +2,7 @@ name: phono
 
 services:
   pg:
-    image: postgres:18rc1
+    image: docker.io/library/postgres:18
     restart: always
     environment:
       POSTGRES_USER: postgres
@@ -13,22 +13,21 @@ services:
       - "./docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:ro"
       - "./pgdata:/var/lib/postgresql/18/docker"
 
-  keycloak:
-    depends_on: [pg]
-    restart: always
-    build:
-      context: .
-      dockerfile: keycloak.dockerfile
-    environment:
-      KC_DB: postgres
-      KC_DB_URL: jdbc:postgresql://pg:5432/keycloak
-      KC_DB_USERNAME: keycloak
-      KC_DB_PASSWORD: guest
-      KC_HOSTNAME: 0.0.0.0
-      KEYCLOAK_ADMIN: admin
-      KEYCLOAK_ADMIN_PASSWORD: guest
-    command: [start, --optimized]
-    ports:
-      - "127.0.0.1:9000:9000"
-      - "127.0.0.1:8443:8443"
-
+  # keycloak:
+  #   depends_on: [pg]
+  #   restart: always
+  #   build:
+  #     context: .
+  #     dockerfile: keycloak.dockerfile
+  #   environment:
+  #     KC_DB: postgres
+  #     KC_DB_URL: jdbc:postgresql://pg:5432/keycloak
+  #     KC_DB_USERNAME: keycloak
+  #     KC_DB_PASSWORD: guest
+  #     KC_HOSTNAME: 0.0.0.0
+  #     KEYCLOAK_ADMIN: admin
+  #     KEYCLOAK_ADMIN_PASSWORD: guest
+  #   command: [start, --optimized]
+  #   ports:
+  #     - "127.0.0.1:9000:9000"
+  #     - "127.0.0.1:8443:8443"

dev-services/run-pg-with-apple-container.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# Starts a Postgres container using Apple's `container` tool:
+# https://github.com/apple/container
+#
+# You'll need to use `container list` to find the new container's IP address in
+# order to connect to it from the Phonograph server.
+
+if ! (container volume ls | grep 'phono-pg'); then
+  container volume create -s 2G phono-pg
+fi
+container run --name phono-pg \
+  -e POSTGRES_USER=postgres \
+  -e POSTGRES_PASSWORD=guest \
+  -e PGDATA=/var/lib/postgresql/18/docker/pgdata \
+  -v "$(dirname "$0")/dev-services/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d:ro" \
+  -v phono-pg:/var/lib/postgresql/18/docker \
+  postgres:18

mise.toml

@@ -24,6 +24,9 @@ sources = ["svelte/src/**/*.ts", "svelte/src/**/*.svelte"]
 run = "sass sass/:css_dist/"
 sources = ["sass/**/*.scss"]
 
+[tasks.pg-container]
+run = "sh ./dev-services/run-pg-with-apple-container.sh"
+
 [env]
 RUST_LOG = "debug"
 RUST_BACKTRACE = "1"