V 1.0.0: Netzwerk im Docker angepasst

mailto vor die Adresse im footer
2026-02-23 10:47:19 +00:00
parent e28cca1c46
commit fec587a524
8 changed files with 103 additions and 22 deletions
--- a/.env.example
+++ b/.env.example
@@ -6,5 +6,4 @@ DB_USER=root
 DB_PASS=IhrMySQLPasswort
 DB_NAME=RXF

-# Build-Datum (wird automatisch beim Build gesetzt, Format: DD.MM.YYYY)
-BUILD_DATE=$(date +%d.%m.%Y)
+# Build-Datum wird automatisch beim Build gesetzt - nicht hier definieren!
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -99,7 +99,7 @@ export default function Home() {

        <footer className="mt-8 flex justify-between items-center text-sm text-gray-600 px-4">
          <a href="mailto:rxf@gmx.de" className="hover:underline">
-            rxf@gmx.de
+            mailto:rxf@gmx.de
          </a>
          <div>
            Version {version} - {buildDate}
--- a/build-local.sh
+++ b/build-local.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Lokales Build-Script für Esprimo
+# Baut das Image mit aktuellem Build-Datum
+
+set -e
+
+BUILD_DATE=$(date +%d.%m.%Y)
+
+echo "=========================================="
+echo "Lokaler Build"
+echo "Build-Datum: ${BUILD_DATE}"
+echo "=========================================="
+echo ""
+
+BUILD_DATE=${BUILD_DATE} docker compose -f docker-compose.local.yml up -d --build
+
+echo ""
+echo "✓ Build abgeschlossen!"
+echo "   App läuft auf http://localhost:3000"
+echo "   Build-Datum: ${BUILD_DATE}"
--- a/deploy.sh
+++ b/deploy.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# Deploy Script für werte-next
+# Baut das Docker Image und lädt es zu docker.citysensor.de hoch
+
+set -e
+
+# Konfiguration
+REGISTRY="docker.citysensor.de"
+IMAGE_NAME="werte-next"
+TAG="${1:-latest}"  # Erster Parameter oder "latest"
+FULL_IMAGE="${REGISTRY}/${IMAGE_NAME}:${TAG}"
+
+# Build-Datum
+BUILD_DATE=$(date +%d.%m.%Y)
+
+echo "=========================================="
+echo "Werte-Next Deploy Script"
+echo "=========================================="
+echo "Registry: ${REGISTRY}"
+echo "Image: ${IMAGE_NAME}"
+echo "Tag: ${TAG}"
+echo "Build-Datum: ${BUILD_DATE}"
+echo "=========================================="
+echo ""
+
+# 1. Docker Image bauen
+echo ">>> Baue Docker Image..."
+docker build \
+  --build-arg BUILD_DATE="${BUILD_DATE}" \
+  -t "${IMAGE_NAME}:${TAG}" \
+  -t "${FULL_IMAGE}" \
+  .
+
+echo ">>> Build erfolgreich!"
+echo ""
+
+# 2. Login zur Registry (falls noch nicht eingeloggt)
+echo ">>> Login zu ${REGISTRY}..."
+docker login "${REGISTRY}"
+echo ""
+
+# 3. Image pushen
+echo ">>> Pushe Image zu ${REGISTRY}..."
+docker push "${FULL_IMAGE}"
+
+echo ""
+echo "=========================================="
+echo "✓ Deploy erfolgreich abgeschlossen!"
+echo "=========================================="
+echo ""
+echo "Auf dem Server ausführen:"
+echo "  docker pull ${FULL_IMAGE}"
+echo "  docker-compose -f docker-compose.prod.yml up -d"
+echo ""
--- a/docker-compose.local.yml
+++ b/docker-compose.local.yml
@@ -0,0 +1,17 @@
+# Docker Compose für lokale Entwicklung auf Esprimo (ohne Traefik)
+services:
+  werte-app:
+    build:
+      context: .
+      args:
+        BUILD_DATE: ${BUILD_DATE:-$(date +%d.%m.%Y)}
+    container_name: werte-next-app
+    restart: unless-stopped
+    ports:
+      - "0.0.0.0:3000:3000"
+    environment:
+      - NODE_ENV=production
+      - DB_HOST=${DB_HOST}
+      - DB_USER=${DB_USER}
+      - DB_PASS=${DB_PASS}
+      - DB_NAME=${DB_NAME}
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,12 +1,9 @@
+# Docker Compose für Production Server mit Traefik
 services:
  werte-app:
-    build:
-      context: .
-      args:
-        BUILD_DATE: ${BUILD_DATE:-$(date +%d.%m.%Y)}
+    image: docker.citysensor.de/werte-next:latest
    container_name: werte-next-app
    restart: unless-stopped
-    # Port wird nicht nach außen exponiert - Traefik greift über das Docker-Netzwerk zu
    expose:
      - 3000
    environment:
@@ -29,8 +26,12 @@ services:
      - traefik.http.services.werte.loadbalancer.server.port=3000  
    networks:
      - proxy
+      - gitea-internal
+
 networks:
  proxy:
    name: dockge_default
    external: true
-
+  gitea-internal:
+    name: gitea_gitea-internal
+    external: true
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,7 +68,6 @@
      "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@babel/code-frame": "^7.29.0",
        "@babel/generator": "^7.29.0",
@@ -1563,7 +1562,6 @@
      "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "csstype": "^3.2.2"
      }
@@ -1623,7 +1621,6 @@
      "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@typescript-eslint/scope-manager": "8.56.0",
        "@typescript-eslint/types": "8.56.0",
@@ -2149,7 +2146,6 @@
      "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "bin": {
        "acorn": "bin/acorn"
      },
@@ -2502,7 +2498,6 @@
        }
      ],
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "baseline-browser-mapping": "^2.9.0",
        "caniuse-lite": "^1.0.30001759",
@@ -3079,7 +3074,6 @@
      "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@eslint-community/eslint-utils": "^4.8.0",
        "@eslint-community/regexpp": "^4.12.1",
@@ -3265,7 +3259,6 @@
      "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "@rtsao/scc": "^1.1.0",
        "array-includes": "^3.1.9",
@@ -5546,7 +5539,6 @@
      "resolved": "https://registry.npmjs.org/react/-/react-19.2.3.tgz",
      "integrity": "sha512-Ku/hhYbVjOQnXDZFv2+RibmLFGwFdeeKHFcOTlrt7xplBnya5OGn/hIRDsqDiSUcfORsDC7MPxwork8jBwsIWA==",
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=0.10.0"
      }
@@ -5556,7 +5548,6 @@
      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.3.tgz",
      "integrity": "sha512-yELu4WmLPw5Mr/lmeEpox5rw3RETacE++JgHqQzd2dg+YbJuat3jH4ingc+WPZhxaoFzdv9y33G+F7Nl5O0GBg==",
      "license": "MIT",
-      "peer": true,
      "dependencies": {
        "scheduler": "^0.27.0"
      },
@@ -6266,7 +6257,6 @@
      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "engines": {
        "node": ">=12"
      },
@@ -6429,7 +6419,6 @@
      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
      "dev": true,
      "license": "Apache-2.0",
-      "peer": true,
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@@ -6705,7 +6694,6 @@
      "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
      "dev": true,
      "license": "MIT",
-      "peer": true,
      "funding": {
        "url": "https://github.com/sponsors/colinhacks"
      }
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "werte_next",
-  "version": "0.1.1",
+  "version": "1.0.0",
  "private": true,
  "scripts": {
    "dev": "next dev",