diff --git a/packages/server/Dockerfile b/packages/server/Dockerfile index d29d19d17..7ae3023d1 100644 --- a/packages/server/Dockerfile +++ b/packages/server/Dockerfile @@ -68,6 +68,7 @@ ENV FILE_SIZE_LIMIT_MB=${FILE_SIZE_LIMIT_MB} \ SPECKLE_SERVER_VERSION=${SPECKLE_SERVER_VERSION} WORKDIR /speckle-server +COPY --from=build-stage /speckle-server/package.json ./package.json COPY --from=build-stage /speckle-server/wait /wait COPY --from=build-stage /speckle-server/tini /tini COPY --from=build-stage /speckle-server/packages/shared /speckle-server/packages/shared @@ -75,9 +76,13 @@ COPY --from=build-stage /speckle-server/packages/objectloader /speckle-server/pa COPY --from=dependency-stage /speckle-server/node_modules ./node_modules WORKDIR /speckle-server/packages/server +COPY --from=build-stage /speckle-server/packages/server/package.json ./package.json COPY --from=build-stage /speckle-server/packages/server/dist ./dist COPY --from=build-stage /speckle-server/packages/server/assets ./assets COPY --from=build-stage /speckle-server/packages/server/bin ./bin +# Copy only if exists https://stackoverflow.com/questions/31528384/conditional-copy-add-in-dockerfile/46801962#46801962 +COPY --from=dependency-stage /speckle-server/packages/server/node_module[s] ./node_modules + ENTRYPOINT ["node"] CMD ["bin/www"] diff --git a/packages/server/package.json b/packages/server/package.json index 57f7eb858..e05d51fb8 100644 --- a/packages/server/package.json +++ b/packages/server/package.json @@ -66,6 +66,7 @@ "express-async-errors": "^3.1.1", "express-prom-bundle": "^6.6.0", "express-session": "^1.17.1", + "graphql": "^16.6.0", "graphql-redis-subscriptions": "^2.2.2", "graphql-scalars": "^1.18.0", "graphql-subscriptions": "^2.0.0", @@ -171,7 +172,6 @@ "enforce-unique": "^1.3.0", "eslint": "^8.11.0", "eslint-config-prettier": "^8.5.0", - "graphql": "^16.6.0", "http-proxy-middleware": "v3.0.0-beta.0", "ioredis-mock": "^8.9.0", "mocha": "^10.1.0",