From 76d7f0757912265d4373970e8b909cc06aa44b0e Mon Sep 17 00:00:00 2001 From: uu-z Date: Wed, 14 Jun 2023 19:58:56 +0800 Subject: [PATCH] fix docker build --- Dockerfile | 5 +++-- docker-compose-dev.yaml | 8 ++++---- package.json | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7c6cd410..a0505039 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ #build studio -FROM node:18-slim AS build-nodejs +FROM node:18 AS build-nodejs WORKDIR /w3bstream-studio + RUN npm i pnpm -g COPY package.json pnpm-lock.yaml ./ COPY prisma ./prisma @@ -12,7 +13,7 @@ RUN pnpm build:standalone #run -FROM node:18-slim +FROM node:18 EXPOSE 3000 diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml index 479f83a4..15d01631 100644 --- a/docker-compose-dev.yaml +++ b/docker-compose-dev.yaml @@ -47,10 +47,10 @@ services: - '3000:3000' environment: DATABASE_URL: postgresql://${POSTGRES_USER:-w3badmin}:${POSTGRES_PASSWORD:-PaSsW0Rd}@postgres:5432/${POSTGRES_DB:-w3bstream} - NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://w3bapp:8888} - NEXT_PUBLIC_EVENT_URL: ${NEXT_PUBLIC_EVENT_URL:-http://w3bapp:8889} - NEXT_PUBLIC_MQTT_URL: ${NEXT_PUBLIC_MQTT_URL:-mqtt://mqtt_server:1883} - NEXT_PUBLIC_METRICS_URL: ${NEXT_PUBLIC_METRICS_URL:-http://prometheus:9090} + NEXT_PUBLIC_API_URL: http://w3bapp:8888 + NEXT_PUBLIC_EVENT_URL: http://w3bapp:8889 + NEXT_PUBLIC_MQTT_URL: mqtt://mqtt_server:1883 + NEXT_PUBLIC_METRICS_URL: http://prometheus:9090 ADMIN_KEY: ${ADMIN_KEY:-iotex.W3B.admin} JWT_SIGN_KEY: ${JWT_SIGN_KEY:-xxxx} diff --git a/package.json b/package.json index 18565701..8fcd7660 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "w3bstream-devnet", - "version": "1.2.5-rc2", + "version": "1.2.5-rc3", "license": "MIT", "description": "Starter pack using Nextjs, React, Typescript, tRPC, Mantine and Cypress", "keywords": [