diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index b0cbfac..09122e2 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -6,6 +6,8 @@ services: build: context: ./server dockerfile: Dockerfile.dev + additional_contexts: + platform-server: ../cc-platform-core/server container_name: turtle-server-dev ports: - "3001:3001" diff --git a/docker-compose.yml b/docker-compose.yml index d740de8..71030ef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,8 @@ services: build: context: ./server dockerfile: Dockerfile + additional_contexts: + platform-server: ../cc-platform-core/server container_name: turtle-server ports: - "4200:3001" # HTTP API + WebSocket (unified) diff --git a/server/Dockerfile b/server/Dockerfile index 155ebb3..aec8ec8 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -3,9 +3,17 @@ FROM node:18-alpine WORKDIR /app +# Copy platform server package from additional build context +COPY --from=platform-server . /app/platform-server/ +RUN rm -rf /app/platform-server/node_modules + # Copy package files COPY package*.json ./ +# Rewrite file: dependency to use the local copy inside the container +RUN sed -i 's|file:../../cc-platform-core/server|file:./platform-server|' package.json \ + && rm -f package-lock.json + # Install dependencies RUN npm install --omit=dev diff --git a/server/Dockerfile.dev b/server/Dockerfile.dev index d7ac742..d562070 100644 --- a/server/Dockerfile.dev +++ b/server/Dockerfile.dev @@ -3,12 +3,20 @@ FROM node:18-alpine WORKDIR /app +# Copy platform server package from additional build context +COPY --from=platform-server . /app/platform-server/ +RUN rm -rf /app/platform-server/node_modules + # Install nodemon for hot reload RUN npm install -g nodemon # Copy package files COPY package*.json ./ +# Rewrite file: dependency to use the local copy inside the container +RUN sed -i 's|file:../../cc-platform-core/server|file:./platform-server|' package.json \ + && rm -f package-lock.json + # Install all dependencies (including dev) RUN npm install