diff --git a/Dockerfile b/Dockerfile index e37c0bd..d952065 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,21 +23,18 @@ FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1 WORKDIR /app +### NEW ### +COPY --from=build /app/node_modules ./node_modules + COPY --from=build /app/dist ./dist #COPY --from=build /app/index.html ./dist/ COPY --from=build /app/frontend/index.html ./dist/frontend/ COPY --from=rust-build /usr/local/cargo/bin/iching /usr/local/bin/iching - -### NEW ### RUN find dist/backend -name "*.js" -exec bash -c 'mv "$0" "${0%.js}.mjs"' {} \; RUN find dist/frontend -name "*.js" -exec bash -c 'mv "$0" "${0%.js}.mjs"' {} \; -#RUN mkdir -p dist/iching -#RUN cp dist/*.js dist/iching/ - -#RUN node dist/iching/server.js RUN node dist/backend/server.mjs & #CMD ["npx", "http-server", "dist", "-p", "8080", "--mime", "application/javascript=js"] diff --git a/backend/server.ts b/backend/server.ts index 2f5e7c6..9dbb2c2 100644 --- a/backend/server.ts +++ b/backend/server.ts @@ -1,4 +1,3 @@ -// backend/server.ts import express from 'express'; import { executeCommand } from './broker';