Merge branch 'main' into cleanup-unnecessary-hashset

PeerDB-io · Nov 22, 2023 · 97638fb · 97638fb
2 parents 7ab8398 + c2117e2
commit 97638fb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/dev-peerdb.sh b/dev-peerdb.sh
@@ -7,5 +7,5 @@ then
     exit 1
 fi
 
-docker compose -f docker-compose-dev.yml up --build\
+docker compose -f docker-compose-dev.yml up --build \
  --no-attach temporal --no-attach pyroscope --no-attach temporal-ui
diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -64,7 +64,7 @@ services:
       - POSTGRES_PWD=postgres
       - POSTGRES_SEEDS=catalog
       - DYNAMIC_CONFIG_FILE_PATH=config/dynamicconfig/development-sql.yaml
-    image: temporalio/auto-setup:1.22.1
+    image: temporalio/auto-setup:1.22
     ports:
       - 7233:7233
     volumes:
@@ -85,7 +85,7 @@ services:
     environment:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CLI_ADDRESS=temporal:7233
-    image: temporalio/admin-tools:1.22.1
+    image: temporalio/admin-tools:1.22
     stdin_open: true
     tty: true
     healthcheck:
@@ -102,7 +102,7 @@ services:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CORS_ORIGINS=http://localhost:3000
       - TEMPORAL_CSRF_COOKIE_INSECURE=true
-    image: temporalio/ui:2.17.2
+    image: temporalio/ui:2.21.3
     ports:
       - 8085:8080
 

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.1
+    image: temporalio/auto-setup:1.22
     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.1
+    image: temporalio/admin-tools:1.22
     stdin_open: true
     tty: true
     healthcheck:
@@ -89,7 +89,7 @@ services:
       - TEMPORAL_ADDRESS=temporal:7233
       - TEMPORAL_CORS_ORIGINS=http://localhost:3000
       - TEMPORAL_CSRF_COOKIE_INSECURE=true
-    image: temporalio/ui:2.17.2
+    image: temporalio/ui:2.21.3
     ports:
       - 8085:8080
 

diff --git a/stacks/peerdb-ui.Dockerfile b/stacks/peerdb-ui.Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && \
   apt-get install -y openssl && \
   mkdir /app && \
   chown -R node:node /app
+ENV NEXT_TELEMETRY_DISABLED 1
 USER node
 WORKDIR /app
 
@@ -16,16 +17,11 @@ COPY --chown=node:node ui/package.json ui/package-lock.json .
 RUN npm ci
 COPY --chown=node:node ui/ .
 
-# Prisma
-RUN npx prisma generate
-
-ENV NEXT_TELEMETRY_DISABLED 1
-RUN npm run build
+RUN npx prisma generate && npm run build
 
 # Builder stage
 FROM base AS runner
 ENV NODE_ENV production
-ENV NEXT_TELEMETRY_DISABLED 1
 
 COPY --from=builder /app/public ./public