Christopher.Hase/iching-broker-level3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add http-server part 8.3.1

Browse source
This commit is contained in:
Christopher Hase 2025-04-14 11:37:50 +02:00
parent ff7bf73e93
commit 174ab60173
9 changed files with 32 additions and 208 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/server.ts
View file

@ -7,7 +7,7 @@ const port = 8090;
app.use(cors());
app.post('/command', (req, res) => {
app.post('/api/command', (req, res) => {
executeCommand();
res.status(200).send('Command executed\n');
});

43
ingress.yaml
View file

@ -8,24 +8,27 @@ metadata:
spec:
ingressClassName: nginx
rules:
- host: 192-168-197-2.c-one-infra.de
http:
paths:
- path: /iching/api(/|$)(.*)
pathType: ImplementationSpecific
backend:
service:
name: iching-service
port:
number: 81
- path: /iching(/|$)(.*)
pathType: ImplementationSpecific
backend:
service:
name: iching-service
port:
number: 80
- host: 192-168-197-2.c-one-infra.de
http:
paths:
# API → kein Rewrite
- path: /iching/api(/|$)(.*)
pathType: ImplementationSpecific
backend:
service:
name: iching-service
port:
number: 81
# Frontend → mit Rewrite
- path: /iching(/|$)(.*)
pathType: ImplementationSpecific
backend:
service:
name: iching-service
port:
number: 80
tls:
- hosts:
- 192-168-197-2.c-one-infra.de
secretName: argocd-net-tls
- hosts:
- 192-168-197-2.c-one-infra.de
secretName: argocd-net-tls

45
old.2.Dockerfile
View file

@ -1,45 +0,0 @@
# 1. Node.js Build-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1 AS build
WORKDIR /app
COPY package*.json ./
COPY . .
RUN npm install -g npm@11.2.0
RUN npm install
#RUN npx tsc -p tsconfig.json
RUN npx tsc -p tsconfig.backend.json
RUN npx tsc -p tsconfig.frontend.json
### NEW # Danach:
RUN find dist/backend -name "*.js" -exec bash -c 'mv "$0" "${0%.js}.mjs"' {} \;
# 2. Rust build-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/rust:1.74.0 AS rust-build
RUN cargo install iching
# 3. Final runtime
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
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 node dist/backend/server.mjs &
#CMD ["npx", "http-server", "dist", "-p", "8080", "--mime", "application/javascript=js"]
CMD ["npx", "http-server", "dist/frontend", "-p", "8080", "--mime", "application/javascript=js"]

45
old.3.Dockerfile
View file

@ -1,45 +0,0 @@
# 1. Node.js Build-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1 AS build
WORKDIR /app
COPY package*.json ./
COPY tsconfig.json ./
COPY tsconfig.backend.json ./
COPY . .
RUN npm install -g npm@11.2.0
RUN npm install
# Kompiliere zuerst den Backend-Code, sodass broker.mjs und andere Dateien erzeugt werden
RUN npx tsc -p tsconfig.backend.json
# Danach können wir die Frontend-Dateien auch kompilieren
RUN npx tsc -p tsconfig.frontend.json
# 2. Rust build-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/rust:1.74.0 AS rust-build
RUN cargo install iching
# 3. Final runtime
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1
WORKDIR /app
# Kopiere Node-Modules und alle generierten Dateien
COPY --from=build /app/node_modules ./node_modules
COPY --from=build /app/dist ./dist
COPY --from=build /app/frontend/index.html ./dist/frontend/
COPY --from=rust-build /usr/local/cargo/bin/iching /usr/local/bin/iching
# Falls notwendig: Umbenennen von .js zu .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"' {} \;
# Starte den Backend-Server
#RUN node dist/backend/server.js &
CMD ["node", "--loader", "ts-node/esm", "/app/dist/backend/server.js"]
# Starte den Frontend-Server
CMD ["npx", "http-server", "dist/frontend", "-p", "8080", "--mime", "application/javascript=js"]

48
old.Dockerfile
View file

@ -1,48 +0,0 @@
# 1. Node.js Build-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1 AS build
WORKDIR /app
COPY package*.json ./
COPY . .
RUN npm install -g npm@11.2.0
#RUN npx tsc
#RUN npx tsc -p tsconfig.json
#RUN npx tsc event.ts
#RUN npx tsc broker.ts
#RUN npx tsc server.ts
RUN npx tsc -p tsconfig.json
RUN cp index.html dist/
# 2. Rust build-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/rust:1.74.0 AS rust-build
RUN cargo install iching
# 3. Final node.js runtime-Stage
FROM forgejo.edf-bootstrap.cx.fg1.ffm.osc.live/devfw-cicd/node:20.18.1
WORKDIR /app
# 4. Copy previous builds
COPY --from=build /app .
COPY --from=rust-build /usr/local/cargo/bin/iching /usr/local/bin/iching
# Lege das /iching-Verzeichnis in dist an
RUN mkdir -p dist/iching
# Kopiere HTML und JS-Dateien hinein
RUN cp index.html dist/iching/
RUN cp dist/*.js dist/iching/
# 5. Run server & app
RUN node server.js
CMD ["npx", "http-server", "dist", "-p", "8080", "--mime", "application/javascript=js"]

9
old.ingress.yaml
View file

@ -11,8 +11,15 @@ spec:
- host: 192-168-197-2.c-one-infra.de
http:
paths:
- path: /iching/api(/|$)(.*)
pathType: ImplementationSpecific
backend:
service:
name: iching-service
port:
number: 81
- path: /iching(/|$)(.*)
pathType: ImplementationSpecific
pathType: ImplementationSpecific
backend:
service:
name: iching-service

13
old.service.yaml
View file

@ -1,13 +0,0 @@
apiVersion: v1
kind: Service
metadata:
name: iching-service
namespace: argocd
spec:
selector:
app: iching-broker
ports:
- protocol: TCP
port: 80
targetPort: 8080
type: ClusterIP

21
old.tsconfig.backend.json
View file

@ -1,21 +0,0 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./dist/backend", // Zielordner für die kompilierte Backend-Dateien
"rootDir": "./backend", // Quellordner
"module": "NodeNext", // Nutze ES-Modul für Node.js
"moduleResolution": "NodeNext", // NodeNext für die Modulauflösung
"target": "ES2020", // Zielversion
"esModuleInterop": true, // Interoperabilität mit CommonJS und ES-Modulen
"allowSyntheticDefaultImports": true,
"skipLibCheck": true,
"allowJs": true, // Erlaubt es, .js und .mjs Dateien zu importieren
"noEmit": false, // Dateien sollen tatsächlich erzeugt werden (keine Deklarationsdateien)
"resolveJsonModule": true,
"jsx": "react",
"isolatedModules": true
},
"include": [
"backend/**/*.ts"
]
}

14
old.tsconfig.broker.json
View file

@ -1,14 +0,0 @@
{
"compilerOptions": {
"outDir": "./dist/backend",
"rootDir": "./backend",
"module": "NodeNext",
"moduleResolution": "NodeNext",
"target": "ES2020",
"esModuleInterop": true,
"skipLibCheck": true
},
"include": [
"backend/broker.ts"
]
}