From 6846a726f3f083cb4ed9f62dda3cc0c0a39a0cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9l=C3=A8ne=20Martin?= <ln@getodk.org>
Date: Thu, 27 Jun 2024 13:33:48 -0700
Subject: [PATCH] Build images on push to next

---
 .github/workflows/ghcr.yml | 7 +++++--
 docker-compose.yml         | 8 ++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ghcr.yml b/.github/workflows/ghcr.yml
index c7659113..c6ceedb6 100644
--- a/.github/workflows/ghcr.yml
+++ b/.github/workflows/ghcr.yml
@@ -3,8 +3,11 @@ name: GHCR
 on:
   workflow_dispatch:
   push:
-    branches: [master]
-    tags: ["v*.*.*"]
+    branches:
+      - next
+      - use-images
+    tags:
+      - v*.*.*
 
 env:
   REGISTRY: ghcr.io
diff --git a/docker-compose.yml b/docker-compose.yml
index 00ade3ba..44fb887a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,9 +34,7 @@ services:
       - DKIM_KEY_PATH=/etc/exim4/dkim.key.temp
     restart: always
   service:
-    build:
-      context: .
-      dockerfile: service.dockerfile
+    image: 'ghcr.io/getodk/central-service:next'
     depends_on:
       - secrets
       - postgres14
@@ -75,9 +73,7 @@ services:
     logging:
       driver: local
   nginx:
-    build:
-      context: .
-      dockerfile: nginx.dockerfile
+    image: 'ghcr.io/getodk/central-nginx:next'
     depends_on:
       - service
       - enketo