fixup! feat: CI build process for grafana

.github/workflows/grafana.yml

@@ -29,15 +29,15 @@ jobs:
         with:
           install-just: true
 
-      - name: Build docker image for both prod and dev
+      - name: Build docker image
         run: |
             just grafana/build 
 
       - name: Run smoke test
         run: |
           just grafana/serve
-          sleep 5
-          just grafana/smoke-test || { docker logs grafana_1; exit 1; }
+          sleep 10
+          just grafana/smoke-test || { docker logs grafana-grafana_1; exit 1; }
 
       - name: Save docker image
         run: |
@@ -95,8 +95,8 @@ jobs:
       - name: Test image we imported from previous job works
         run: |
             SKIP_BUILD=1 just grafana/serve
-            sleep 5
-            just grafana/smoke-test || { docker logs grafana_1; exit 1; }
+            sleep 10
+            just grafana/smoke-test || { docker logs grafana-grafana_1; exit 1; }
 
       - name: Publish image
         run: |

grafana/docker-compose.yml

@@ -0,0 +1,33 @@
+services:
+  db:
+    image: "postgres:16"
+    environment:
+      POSTGRES_USER: user
+      POSTGRES_PASSWORD: pass
+      POSTGRES_DB: grafana
+    ports:
+      - "6543:5432"
+    volumes:
+      - postgres:/var/lib/postgresql/data/
+
+  grafana:
+    # use Dockerfile so that version matches production
+    build:
+        dockerfile: Dockerfile
+    environment:
+      GF_DATABASE_TYPE: postgres
+      GF_DATABASE_HOST: db:5432
+      GF_DATABASE_NAME: grafana
+      GF_DATABASE_USER: user
+      GF_DATABASE_PASSWORD: pass
+      GF_DATABASE_SSL_MODE: disable
+    depends_on:
+      - db
+    ports:
+      - 3000:3000
+    volumes:
+      - grafana:/var/lib/grafana
+
+volumes:
+  postgres:
+  grafana:

grafana/justfile

@@ -13,14 +13,15 @@ build:
     export GITREF=$(git rev-parse --short HEAD)
 
     # build the thing
-    docker build .
+    docker compose build grafana
 
 serve:
     # Do a basic test with built-in sqlitedb
-    docker run -p 3000:3000 sha256:c9af59530625894c962e8516cfd44f61161c8dee70fa7e5a7fd78d971c4429b5
+    # this should use the Dockerfile version, or this test is pointless
+    docker compose up grafana -d
 
 # run a basic functional smoke test against a running server
-smoke-test host="http://localhost:3000/login":
+smoke-test host="http://127.0.0.1:3000/login":
     #!/bin/bash
     set -eu
     curl -I {{ host }} -s --compressed --fail --retry 20 --retry-delay 1 --retry-all-errors