Compare commits
10 Commits
0259164d11
...
1d7d6c81bf
| Author | SHA1 | Date | |
|---|---|---|---|
| 1d7d6c81bf | |||
| 61f4190f48 | |||
| eee5fbacc9 | |||
| 85b11cb033 | |||
| d250fd758c | |||
| 17c3295607 | |||
| 5f1ffb0d04 | |||
| 413a2d1daa | |||
| 49c53aa912 | |||
| 0a0f5af3bd |
|
|
@ -23,6 +23,8 @@ env:
|
||||||
# Build Arguments für Zora (ARM64 Power)
|
# Build Arguments für Zora (ARM64 Power)
|
||||||
JAVA_VERSION: "25"
|
JAVA_VERSION: "25"
|
||||||
GRADLE_VERSION: "9.3.1"
|
GRADLE_VERSION: "9.3.1"
|
||||||
|
# OPTIMIERUNG: Gradle Parameter für mehr Speed
|
||||||
|
GRADLE_OPTS: "-Dorg.gradle.parallel=true -Dorg.gradle.workers.max=8"
|
||||||
# Deine neuen JVM Power-Flags für ARM64 (Cortex-A720)
|
# Deine neuen JVM Power-Flags für ARM64 (Cortex-A720)
|
||||||
JVM_OPTS_ARM64: "-XX:ActiveProcessorCount=12 -XX:+UseG1GC -XX:+UseTransparentHugePages -XX:+UseSVE=1"
|
JVM_OPTS_ARM64: "-XX:ActiveProcessorCount=12 -XX:+UseG1GC -XX:+UseTransparentHugePages -XX:+UseSVE=1"
|
||||||
|
|
||||||
|
|
@ -33,24 +35,27 @@ jobs:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- service: api-gateway
|
|
||||||
context: .
|
|
||||||
dockerfile: backend/infrastructure/gateway/Dockerfile
|
|
||||||
image: gateway
|
|
||||||
- service: ping-service
|
|
||||||
context: .
|
|
||||||
dockerfile: backend/services/ping/Dockerfile
|
|
||||||
image: ping-service
|
|
||||||
- service: web-app
|
|
||||||
context: .
|
|
||||||
dockerfile: config/docker/caddy/web-app/Dockerfile
|
|
||||||
image: web-app
|
|
||||||
# NEU: Keycloak wird jetzt auch automatisch gebaut und gepusht
|
# NEU: Keycloak wird jetzt auch automatisch gebaut und gepusht
|
||||||
- service: keycloak
|
- service: keycloak
|
||||||
context: .
|
context: .
|
||||||
dockerfile: config/docker/keycloak/Dockerfile
|
dockerfile: config/docker/keycloak/Dockerfile
|
||||||
image: keycloak
|
image: keycloak
|
||||||
|
|
||||||
|
- service: api-gateway
|
||||||
|
context: .
|
||||||
|
dockerfile: backend/infrastructure/gateway/Dockerfile
|
||||||
|
image: gateway
|
||||||
|
|
||||||
|
- service: ping-service
|
||||||
|
context: .
|
||||||
|
dockerfile: backend/services/ping/Dockerfile
|
||||||
|
image: ping-service
|
||||||
|
|
||||||
|
- service: web-app
|
||||||
|
context: .
|
||||||
|
dockerfile: config/docker/caddy/web-app/Dockerfile
|
||||||
|
image: web-app
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout repository
|
- name: Checkout repository
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
|
|
@ -61,6 +66,7 @@ jobs:
|
||||||
with:
|
with:
|
||||||
java-version: '25'
|
java-version: '25'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
cache: gradle
|
||||||
|
|
||||||
# Cache für Gradle (Beschleunigt Folgebauvorgänge massiv)
|
# Cache für Gradle (Beschleunigt Folgebauvorgänge massiv)
|
||||||
- name: Setup Gradle Cache
|
- name: Setup Gradle Cache
|
||||||
|
|
@ -78,12 +84,17 @@ jobs:
|
||||||
if: matrix.service == 'web-app'
|
if: matrix.service == 'web-app'
|
||||||
run: |
|
run: |
|
||||||
chmod +x gradlew
|
chmod +x gradlew
|
||||||
./gradlew :frontend:shells:meldestelle-portal:jsBrowserDistribution -Pproduction=true --no-daemon
|
./gradlew :frontend:shells:meldestelle-portal:jsBrowserDistribution \
|
||||||
|
-Pproduction=true \
|
||||||
|
--max-workers=8 \
|
||||||
|
-Dkotlin.daemon.jvm.options="-Xmx4g"
|
||||||
|
|
||||||
# OPTIMIERUNG: QEMU entfernt, da der Runner nativ auf ARM64 (Zora) läuft.
|
|
||||||
# Docker Buildx für effizienten Build-Support
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
|
# with:
|
||||||
|
# # Wir erzwingen die Nutzung des Host-Drivers,
|
||||||
|
# # um gRPC-Abstürze im Container-Builder zu vermeiden
|
||||||
|
# driver: docker
|
||||||
|
|
||||||
# Login bei deiner Gitea Registry
|
# Login bei deiner Gitea Registry
|
||||||
- name: Log in to the Container registry
|
- name: Log in to the Container registry
|
||||||
|
|
@ -105,7 +116,7 @@ jobs:
|
||||||
|
|
||||||
# Build und Push (Nativ ARM64 für maximale Geschwindigkeit)
|
# Build und Push (Nativ ARM64 für maximale Geschwindigkeit)
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
uses: docker/build-push-action@v5
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
context: ${{ matrix.context }}
|
context: ${{ matrix.context }}
|
||||||
file: ${{ matrix.dockerfile }}
|
file: ${{ matrix.dockerfile }}
|
||||||
|
|
@ -121,7 +132,7 @@ jobs:
|
||||||
JAVA_VERSION=${{ env.JAVA_VERSION }}
|
JAVA_VERSION=${{ env.JAVA_VERSION }}
|
||||||
KEYCLOAK_IMAGE_TAG=26.4
|
KEYCLOAK_IMAGE_TAG=26.4
|
||||||
JVM_OPTS_APPEND=${{ env.JVM_OPTS_ARM64 }}
|
JVM_OPTS_APPEND=${{ env.JVM_OPTS_ARM64 }}
|
||||||
# KORREKTUR: 'inline' Cache statt 'gha' für Gitea-Kompatibilität
|
# cache-from: type=local,src=/tmp/.buildx-cache
|
||||||
cache-from: type=inline
|
# cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
|
||||||
cache-to: type=inline,mode=max
|
# cache-from: type=gha
|
||||||
|
# cache-to: type=gha,mode=max
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Multi-stage Dockerfile for Meldestelle API Gateway
|
# Multi-stage Dockerfile for Meldestelle API Gateway
|
||||||
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Multi-stage Dockerfile for Meldestelle Entries Service
|
# Multi-stage Dockerfile for Meldestelle Entries Service
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Multi-stage Dockerfile for Meldestelle Ping Service
|
# Multi-stage Dockerfile for Meldestelle Ping Service
|
||||||
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
# Features: Security hardening, monitoring support, optimal caching, BuildKit cache mounts
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
ARG GRADLE_VERSION
|
ARG GRADLE_VERSION
|
||||||
ARG JAVA_VERSION
|
ARG JAVA_VERSION
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
ARG GRADLE_VERSION
|
ARG GRADLE_VERSION
|
||||||
ARG JAVA_VERSION
|
ARG JAVA_VERSION
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Dockerfile for Meldestelle Web-App (Hybrid Build)
|
# Dockerfile for Meldestelle Web-App (Hybrid Build)
|
||||||
# Version: 3.2.0 - Optimized & Cleaned
|
# Version: 3.2.0 - Optimized & Cleaned
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Production-Ready Keycloak Dockerfile
|
# Production-Ready Keycloak Dockerfile
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
# syntax=docker/dockerfile:1.8
|
|
||||||
# ===================================================================
|
# ===================================================================
|
||||||
# Multi-Stage Dockerfile for Meldestelle Web-App (Kotlin/JS)
|
# Multi-Stage Dockerfile for Meldestelle Web-App (Kotlin/JS)
|
||||||
# Version: 2.3.1 - Optimized for Production Build (No Source Maps)
|
# Version: 2.3.1 - Optimized for Production Build (No Source Maps)
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
## 1. System-Übersicht & Architektur
|
## 1. System-Übersicht & Architektur
|
||||||
|
|
||||||
Das System "MS-R1" (interner Codename "Das Biest") ist ein High-End ARM64-Server auf Basis des CIX P1 SoC.
|
Das System "MS-R1" (interner Codename "Zora") ist ein High-End ARM64-Server auf Basis des CIX P1 SoC.
|
||||||
|
|
||||||
### Hardware-Spezifikationen
|
### Hardware-Spezifikationen
|
||||||
|
|
||||||
|
|
|
||||||
86
docs/Pangolin-vs-Cloudflare-Tunnel.md
Normal file
86
docs/Pangolin-vs-Cloudflare-Tunnel.md
Normal file
|
|
@ -0,0 +1,86 @@
|
||||||
|
---
|
||||||
|
Pangolin vs. Cloudflare Tunnel
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🛡️ Pangolin vs. Cloudflare Tunnel
|
||||||
|
|
||||||
|
| Merkmal | Cloudflare Tunnel (`cloudflared`) | Pangolin (Self-Hosted) |
|
||||||
|
|------------------|---------------------------------------------|-------------------------------------------------|
|
||||||
|
| **Kontrolle** | Zentralisiert (Cloudflare sieht Traffic). | **Dezentral** (Du besitzt den VPS & Schlüssel). |
|
||||||
|
| **Datenschutz** | SSL terminiert bei Cloudflare. | **End-to-End** (SSL terminiert auf DEINEM VPS). |
|
||||||
|
| **AGB / Limits** | Verbot von Video-Streaming (Plex/Jellyfin). | **Keine Limits** (Du bestimmst den Traffic). |
|
||||||
|
| **Protokolle** | Primär TCP/HTTP. | **TCP & UDP** (Dank WireGuard-Basis). |
|
||||||
|
| **Kosten** | Kostenlos (Free Tier). | VPS-Miete (ca. 4€ bei Hetzner). |
|
||||||
|
| **Features** | WAF, DDoS-Schutz (proprietär). | SSO, CrowdSec, Geoblocking (Open Source). |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 🚀 Deployment-Bauplan (Hetzner + MS-R1)
|
||||||
|
|
||||||
|
### Teil 1: VPS Setup (Hetzner Cloud)
|
||||||
|
|
||||||
|
1. Erstelle einen **CX21** VPS (Location: Frankfurt für geringste Latenz).
|
||||||
|
2. Installiere Docker und erstelle das Pangolin-Verzeichnis.
|
||||||
|
|
||||||
|
**Docker Compose für den VPS (`compose.yaml`):**
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
pangolin:
|
||||||
|
image: ghcr.io/m-pennat/pangolin:latest
|
||||||
|
container_name: pangolin
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "80:80" # HTTP (Let's Encrypt)
|
||||||
|
- "443:443" # HTTPS
|
||||||
|
- "51820:51820/udp" # WireGuard Tunnel
|
||||||
|
volumes:
|
||||||
|
- ./data:/var/lib/pangolin
|
||||||
|
- /var/run/docker.sock:/var/run/docker.sock
|
||||||
|
environment:
|
||||||
|
- PANGOLIN_DOMAIN=dashboard.deinedomain.de
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
*Nach dem Start (`docker compose up -d`) unter der Domain einloggen und einen neuen **Site-Client** anlegen, um den **Enrollment Token** zu erhalten.*
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Teil 2: Home-Server Setup (MS-R1 / Debian 12 arm64)
|
||||||
|
|
||||||
|
Auf deinem MS-R1 installierst du den Gegenpart **Newt**. Da du Debian 12 auf arm64 nutzt, ist das Setup extrem ressourcensparend.
|
||||||
|
|
||||||
|
**Docker Compose für den MS-R1 (`compose.yaml`):**
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
# Der Tunnel-Client
|
||||||
|
newt:
|
||||||
|
image: ghcr.io/m-pennat/newt:latest
|
||||||
|
container_name: newt
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
- NEWT_ENROLL_TOKEN=DEIN_TOKEN_VON_HETZNER_VPS
|
||||||
|
depends_on:
|
||||||
|
- gitea
|
||||||
|
|
||||||
|
# Dein Service (Beispiel: Gitea)
|
||||||
|
gitea:
|
||||||
|
image: gitea/gitea:latest
|
||||||
|
container_name: gitea
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- ./gitea_data:/data
|
||||||
|
# Hinweis: Kein "ports"-Mapping nötig! Zugriff erfolgt über den Tunnel.
|
||||||
|
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 💡 Warum das für dich ein "Erfolg" ist
|
||||||
|
|
||||||
|
* **Kein Port-Forwarding:** Dein Router zu Hause bleibt komplett dicht.
|
||||||
|
* **Arm64-Optimiert:** Debian 12 und die Container nutzen kaum CPU-Zyklen deines MS-R1.
|
||||||
|
* **Identity-Aware Proxy:** Du kannst im Pangolin-Dashboard (Hetzner) mit drei Klicks einstellen, dass man sich erst per **Google** oder **GitHub** anmelden muss, um dein Gitea überhaupt zu sehen.
|
||||||
|
|
||||||
|
---
|
||||||
Loading…
Reference in New Issue
Block a user