rebasing

PeerDB-io · Oct 23, 2023 · 3d455c8 · 3d455c8
1 parent 627c032
commit 3d455c8
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -57,7 +57,7 @@ services:
       - POSTGRES_PWD=postgres
       - POSTGRES_SEEDS=catalog
       - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
-    image: temporalio/auto-setup:1.22.2
+    image: temporalio/auto-setup:1.22.1
     ports:
       - 7233:7233
     volumes:
@@ -78,7 +78,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:1.22.2
+    image: temporalio/admin-tools:1.22.1
     stdin_open: true
     tty: true
     healthcheck:
@@ -103,7 +103,8 @@ services:
     container_name: flow_api
     build:
       context: .
-      dockerfile: stacks/flow-api.Dockerfile
+      dockerfile: stacks/flow.Dockerfile
+      target: flow-api
     ports:
       - 8112:8112
       - 8113:8113
@@ -118,7 +119,8 @@ services:
     container_name: flow-snapshot-worker
     build:
       context: .
-      dockerfile: stacks/flow-snapshot-worker.Dockerfile
+      dockerfile: stacks/flow.Dockerfile
+      target: flow-snapshot-worker
     environment:
       TEMPORAL_HOST_PORT: temporal:7233
     depends_on:
@@ -129,7 +131,8 @@ services:
     container_name: flow-worker1
     build:
       context: .
-      dockerfile: stacks/flow-worker.Dockerfile
+      dockerfile: stacks/flow.Dockerfile
+      target: flow-worker
     environment:
       <<: [*catalog-config, *flow-worker-env]
       METRICS_SERVER: 0.0.0.0:6061
@@ -144,7 +147,8 @@ services:
     container_name: flow-worker2
     build:
       context: .
-      dockerfile: stacks/flow-worker.Dockerfile
+      dockerfile: stacks/flow.Dockerfile
+      target: flow-worker
     environment:
       <<: [*catalog-config, *flow-worker-env]
       METRICS_SERVER: 0.0.0.0:6063
@@ -162,7 +166,8 @@ services:
     container_name: flow-worker3
     build:
       context: .
-      dockerfile: stacks/flow-worker.Dockerfile
+      dockerfile: stacks/flow.Dockerfile
+      target: flow-worker
     environment:
       <<: [*catalog-config, *flow-worker-env]
       METRICS_SERVER: 0.0.0.0:6065

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -57,7 +57,7 @@ services:
       - POSTGRES_PWD=postgres
       - POSTGRES_SEEDS=catalog
       - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
-    image: temporalio/auto-setup:1.22.2
+    image: temporalio/auto-setup:1.22.1
     ports:
       - 7233:7233
     volumes:
@@ -72,7 +72,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:1.22.2
+    image: temporalio/admin-tools:1.22.1
     stdin_open: true
     tty: true
     healthcheck:
@@ -95,10 +95,7 @@ services:
 
   flow-api:
     container_name: flow_api
-    build:
-      context: .
-      dockerfile: stacks/flow.Dockerfile
-      target: flow-api
+    image: ghcr.io/peerdb-io/flow-api:latest-dev
     ports:
       - 8112:8112
       - 8113:8113
@@ -111,10 +108,7 @@ services:
 
   flow-snapshot-worker:
     container_name: flow-snapshot-worker
-    build:
-      context: .
-      dockerfile: stacks/flow.Dockerfile
-      target: flow-snapshot-worker
+    image: ghcr.io/peerdb-io/flow-snapshot-worker:latest-dev
     environment:
       <<: [*peerdb-temporal-namespace]
       TEMPORAL_HOST_PORT: temporal:7233
@@ -124,10 +118,7 @@ services:
 
   flow-worker1:
     container_name: flow-worker1
-    build:
-      context: .
-      dockerfile: stacks/flow.Dockerfile
-      target: flow-worker
+    image: ghcr.io/peerdb-io/flow-worker:latest-dev
     environment:
       <<: [*catalog-config, *flow-worker-env, *peerdb-temporal-namespace]
       METRICS_SERVER: 0.0.0.0:6061

diff --git a/stacks/peerdb-ui.Dockerfile b/stacks/peerdb-ui.Dockerfile
@@ -42,7 +42,7 @@ RUN chown nextjs:nodejs .next
 # https://nextjs.org/docs/advanced-features/output-file-tracing
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-COPY stacks/ui-entrypoint.sh /app/entrypoint.sh
+COPY stacks/ui/ui-entrypoint.sh /app/entrypoint.sh
 
 # allow permissions for nextjs user to do anything in /app
 RUN chown -R nextjs:nodejs /app

diff --git a/stacks/ui-entrypoint.sh → stacks/ui/ui-entrypoint.sh b/stacks/ui-entrypoint.sh → stacks/ui/ui-entrypoint.sh