From 42c7548f9972a5e8c1e4c2936e9dbd532c9018ce Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 May 2026 13:54:58 +0200 Subject: [PATCH] Optimized Dockerfile: remove Electron, fix registry login --- .gitea/workflows/docker-build.yml | 4 +--- Dockerfile | 19 ++++--------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/.gitea/workflows/docker-build.yml b/.gitea/workflows/docker-build.yml index 36bbc80..01bc138 100644 --- a/.gitea/workflows/docker-build.yml +++ b/.gitea/workflows/docker-build.yml @@ -14,14 +14,12 @@ jobs: - name: Docker Login run: | - echo "${{ secrets.GITEATOKEN }}" | docker login git.kgessner.de --username keviin --password-stdin + echo "${{ secrets.GITEATOKEN }}" | docker login git.kgessner.de --username LuiiCode --password-stdin - name: Build Image run: | docker build -t git.kgessner.de/keviin/logmaster:latest . - docker tag git.kgessner.de/keviin/logmaster:latest git.kgessner.de/keviin/logmaster:${GITHUB_SHA::8} - name: Push Image run: | docker push git.kgessner.de/keviin/logmaster:latest - docker push git.kgessner.de/keviin/logmaster:${GITHUB_SHA::8} diff --git a/Dockerfile b/Dockerfile index 5164151..65b27bc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,39 +2,28 @@ FROM node:20-alpine AS builder WORKDIR /app COPY package*.json ./ -RUN npm ci --omit=dev && npm ci +RUN npm ci COPY tsconfig.server.json ./ COPY src/server/ ./src/server/ RUN npx tsc -p tsconfig.server.json -# ── Production-Stage: Nur das Nötigste ───────────────────────────── +# ── Production-Stage: Minimal, kein Electron ────────────────────── FROM node:20-alpine WORKDIR /app -# Runtime-User (nicht root) RUN addgroup -S logviewer && adduser -S logviewer -G logviewer -# Nur production dependencies COPY package*.json ./ -RUN npm ci --omit=dev && npm cache clean --force +# Installiere OHNE Electron (wird für Server-Mode nicht gebraucht) +RUN npm ci --omit=dev && npm uninstall electron && npm cache clean --force -# Kompilierte Server-Dateien COPY --from=builder /app/dist-server/ ./dist-server/ - -# Web-UI (statische Assets) COPY src/web/ ./src/web/ -# Persistenz-Volume RUN mkdir -p /app/collector-data /app/monitor-data && \ chown -R logviewer:logviewer /app -# Default-CMD (beide Modi aktiv) EXPOSE 8080 ENV HOST=0.0.0.0 PORT=8080 LOG_MODE=both USER logviewer CMD ["node", "dist-server/server.js"] - -# Mögliche Overrides: -# Collector: -e LOG_MODE=collector -e COLLECTOR_UDP_PORT=5140 -# Viewer: -e LOG_MODE=viewer -p 9090:9090 -# Monitor: -e LOG_MODE=monitor -e MONITOR_RULES='[...]' \ No newline at end of file