DevFW-CICD/iching-broker-level2
16
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

development -> main #1

Open
Christopher.Hase wants to merge 93 commits from development into main
pull from: development
merge into: DevFW-CICD:main
Conversation 0 Commits 93 Files changed 813 +3 -7
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 88e468525f - Show all commits

9
Dockerfile
View file

@ -23,21 +23,18 @@ FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1
WORKDIR /app WORKDIR /app
### NEW ###
COPY --from=build /app/node_modules ./node_modules
COPY --from=build /app/dist ./dist COPY --from=build /app/dist ./dist
#COPY --from=build /app/index.html ./dist/ #COPY --from=build /app/index.html ./dist/
COPY --from=build /app/frontend/index.html ./dist/frontend/ COPY --from=build /app/frontend/index.html ./dist/frontend/
COPY --from=rust-build /usr/local/cargo/bin/iching /usr/local/bin/iching 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/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 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 & RUN node dist/backend/server.mjs &
#CMD ["npx", "http-server", "dist", "-p", "8080", "--mime", "application/javascript=js"] #CMD ["npx", "http-server", "dist", "-p", "8080", "--mime", "application/javascript=js"]

1
backend/server.ts
View file

@ -1,4 +1,3 @@
// backend/server.ts
import express from 'express'; import express from 'express';
import { executeCommand } from './broker'; import { executeCommand } from './broker';