From 29de81fa8bbeb2cb397d093bd8a431b17f6ef003 Mon Sep 17 00:00:00 2001
From: Kevin Biju <kevin@peerdb.io>
Date: Wed, 4 Oct 2023 23:45:57 +0530
Subject: [PATCH] misc changes to docker and image publishing

---
 .github/workflows/dev-docker.yml              | 16 ++++++++
 docker-compose.yml                            | 40 ++++++++++---------
 ...us.Dockerfile => peerdb-server.Dockerfile} |  0
 .../{ui.Dockerfile => peerdb-ui.Dockerfile}   |  0
 4 files changed, 37 insertions(+), 19 deletions(-)
 rename stacks/{nexus.Dockerfile => peerdb-server.Dockerfile} (100%)
 rename stacks/{ui.Dockerfile => peerdb-ui.Dockerfile} (100%)

diff --git a/.github/workflows/dev-docker.yml b/.github/workflows/dev-docker.yml
index 0bc3f33538..826a058ec7 100644
--- a/.github/workflows/dev-docker.yml
+++ b/.github/workflows/dev-docker.yml
@@ -45,6 +45,7 @@ jobs:
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
             ghcr.io/peerdb-io/peerdb-server:dev-${{ steps.vars.outputs.sha_short }}
+            ghcr.io/peerdb-io/peerdb-server:latest-dev
 
       - name: Build (optionally publish) Flow API Dev Image
         uses: depot/build-push-action@v1
@@ -56,6 +57,7 @@ jobs:
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
             ghcr.io/peerdb-io/flow-api:dev-${{ steps.vars.outputs.sha_short }}
+            ghcr.io/peerdb-io/flow-api:latest-dev
 
       - name: Build (optionally publish) Flow Worker Dev Image
         uses: depot/build-push-action@v1
@@ -67,6 +69,7 @@ jobs:
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
             ghcr.io/peerdb-io/flow-worker:dev-${{ steps.vars.outputs.sha_short }}
+            ghcr.io/peerdb-io/flow-worker:latest-dev
 
       - name: Build (optionally publish) Flow Snapshot Worker Dev Image
         uses: depot/build-push-action@v1
@@ -78,3 +81,16 @@ jobs:
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: |
             ghcr.io/peerdb-io/flow-snapshot-worker:dev-${{ steps.vars.outputs.sha_short }}
+            ghcr.io/peerdb-io/flow-snapshot-worker:latest-dev
+
+      - name: Build (optionally publish) PeerDB UI Dev Image
+        uses: depot/build-push-action@v1
+        with:
+          token: ${{ secrets.DEPOT_TOKEN }}
+          platforms: linux/amd64,linux/arm64
+          context: .
+          file: stacks/peerdb-ui.Dockerfile
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: |
+            ghcr.io/peerdb-io/peerdb-ui:dev-${{ steps.vars.outputs.sha_short }}
+            ghcr.io/peerdb-io/peerdb-ui:latest-dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 75e1b8234d..a950a51c2b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -23,7 +23,7 @@ x-flow-worker-env: &flow-worker-env
 services:
   catalog:
     container_name: catalog
-    image: debezium/postgres:15-alpine
+    image: debezium/postgres:16-alpine
     ports:
       - 9901:5432
     environment:
@@ -95,7 +95,7 @@ services:
     ports:
       - 8085:8080
 
-  flow_api:
+  flow-api:
     container_name: flow_api
     build:
       context: .
@@ -109,8 +109,8 @@ services:
       temporal-admin-tools:
         condition: service_healthy
 
-  flow_snapshot_worker:
-    container_name: flow_snapshot_worker
+  flow-snapshot-worker:
+    container_name: flow-snapshot-worker
     build:
       context: .
       dockerfile: stacks/flow-snapshot-worker.Dockerfile
@@ -120,8 +120,8 @@ services:
       temporal-admin-tools:
         condition: service_healthy
 
-  flow_worker1:
-    container_name: flow_worker1
+  flow-worker1:
+    container_name: flow-worker1
     build:
       context: .
       dockerfile: stacks/flow-worker.Dockerfile
@@ -135,8 +135,8 @@ services:
       temporal-admin-tools:
         condition: service_healthy
 
-  flow_worker2:
-    container_name: flow_worker2
+  flow-worker2:
+    container_name: flow-worker2
     build:
       context: .
       dockerfile: stacks/flow-worker.Dockerfile
@@ -153,8 +153,8 @@ services:
       temporal-admin-tools:
         condition: service_healthy
 
-  flow_worker3:
-    container_name: flow_worker3
+  flow-worker3:
+    container_name: flow-worker3
     build:
       context: .
       dockerfile: stacks/flow-worker.Dockerfile
@@ -172,10 +172,10 @@ services:
         condition: service_healthy
 
   peerdb:
-    container_name: peerdb_server
+    container_name: peerdb-server
     build:
       context: .
-      dockerfile: stacks/nexus.Dockerfile
+      dockerfile: stacks/peerdb-server.Dockerfile
     environment:
       <<: *catalog-config
       PEERDB_LOG_DIR: /var/log/peerdb
@@ -189,8 +189,8 @@ services:
       catalog:
         condition: service_healthy
 
-  peerdb_prometheus:
-    container_name: peerdb_prometheus
+  peerdb-prometheus:
+    container_name: peerdb-prometheus
     build:
       context: .
       dockerfile: stacks/prometheus.Dockerfile
@@ -202,8 +202,9 @@ services:
       - multi-metrics
       - metrics
 
-  peerdb_grafana:
-    container_name: peerdb_grafana
+
+  peerdb-grafana:
+    container_name: peerdb-grafana
     build:
       context: .
       dockerfile: stacks/grafana.Dockerfile
@@ -216,11 +217,12 @@ services:
       - multi-metrics
       - metrics
 
-  peerdb_ui:
-    container_name: peerdb_ui
+
+  peerdb-ui:
+    container_name: peerdb-ui
     build:
       context: .
-      dockerfile: stacks/ui.Dockerfile
+      dockerfile: stacks/peerdb-ui.Dockerfile
     ports:
       - 3001:3000
     environment:
diff --git a/stacks/nexus.Dockerfile b/stacks/peerdb-server.Dockerfile
similarity index 100%
rename from stacks/nexus.Dockerfile
rename to stacks/peerdb-server.Dockerfile
diff --git a/stacks/ui.Dockerfile b/stacks/peerdb-ui.Dockerfile
similarity index 100%
rename from stacks/ui.Dockerfile
rename to stacks/peerdb-ui.Dockerfile