Build images on push to next and this branch, use images

getodk · Jun 27, 2024 · abf971f · abf971f
1 parent e49518a
commit abf971f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git 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
@@ -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:use-images'
     depends_on:
       - secrets
       - postgres14
@@ -75,9 +73,7 @@ services:
     logging:
       driver: local
   nginx:
-    build:
-      context: .
-      dockerfile: nginx.dockerfile
+    image: 'ghcr.io/getodk/central-nginx:use-images'
     depends_on:
       - service
       - enketo