From b18c14f1436f9553455374580f38ee8697a6f5de Mon Sep 17 00:00:00 2001 From: Bast Date: Sat, 31 Oct 2026 17:58:02 -0500 Subject: [PATCH] cleanup --- .gitignore | 1 + docker-compose.yml.old10 | 80 -------------- docker-compose.yml.old11 | 82 --------------- docker-compose.yml.old12 | 88 ---------------- docker-compose.yml.old13 | 82 --------------- docker-compose.yml.old14 | 85 --------------- docker-compose.yml.old15 | 84 --------------- docker-compose.yml.old16 | 85 --------------- docker-compose.yml.old16.autoregisteruseless | 84 --------------- docker-compose.yml.old17 | 96 ----------------- docker-compose.yml.old18 | 93 ---------------- docker-compose.yml.old19 | 95 ----------------- docker-compose.yml.old20 | 93 ---------------- docker-compose.yml.old21 | 96 ----------------- docker-compose.yml.old22 | 96 ----------------- docker-compose.yml.old23 | 99 ------------------ docker-compose.yml.old9 | 81 -------------- .../repositories/bast/mytfenv.git/info/refs | 1 + .../bast/mytfenv.git/objects/info/packs | 1 + forgejo_data/gitea/gitea.db | Bin 4009984 -> 4009984 bytes forgejo_data/gitea/queues/common/000073.log | Bin 1458 -> 2243 bytes nginx.conf.old | 37 ------- nginx.conf.old2 | 41 -------- register-runnser.sh => register-runner.sh | 0 register-runnser.sh.old | 6 -- 25 files changed, 3 insertions(+), 1503 deletions(-) create mode 100644 .gitignore delete mode 100644 docker-compose.yml.old10 delete mode 100644 docker-compose.yml.old11 delete mode 100644 docker-compose.yml.old12 delete mode 100644 docker-compose.yml.old13 delete mode 100644 docker-compose.yml.old14 delete mode 100644 docker-compose.yml.old15 delete mode 100644 docker-compose.yml.old16 delete mode 100644 docker-compose.yml.old16.autoregisteruseless delete mode 100644 docker-compose.yml.old17 delete mode 100644 docker-compose.yml.old18 delete mode 100644 docker-compose.yml.old19 delete mode 100644 docker-compose.yml.old20 delete mode 100644 docker-compose.yml.old21 delete mode 100644 docker-compose.yml.old22 delete mode 100644 docker-compose.yml.old23 delete mode 100644 docker-compose.yml.old9 delete mode 100644 nginx.conf.old delete mode 100644 nginx.conf.old2 rename register-runnser.sh => register-runner.sh (100%) delete mode 100755 register-runnser.sh.old diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8e96c8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +forgejo_data diff --git a/docker-compose.yml.old10 b/docker-compose.yml.old10 deleted file mode 100644 index b09dd35..0000000 --- a/docker-compose.yml.old10 +++ /dev/null @@ -1,80 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (KORRIGIERT: Läuft als root, um Docker-Socket-Rechte zu bekommen) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" # <--- WICHTIG: Behebt den "permission denied" Fehler am Docker-Socket - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bullseye,debian-stable:docker://debian:stable-slim - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES INITIALIZER (KORRIGIERT: Bombensicherer Download via wget) - kind-cluster: - image: alpine:latest - container_name: gitops-test-control-plane - networks: - - test-net - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./kind_kubeconfig:/output_kubeconfig - entrypoint: > - sh -c "apk add --no-cache wget docker-cli; - wget -q --show-progress https://k8s.io -O /usr/local/bin/kind; - chmod +x /usr/local/bin/kind; - if ! /usr/local/bin/kind get clusters 2>/dev/null | grep -q gitops-test; then - /usr/local/bin/kind create cluster --name gitops-test --image kindest/node:v1.28.0; - fi; - /usr/local/bin/kind get kubeconfig --name gitops-test > /output_kubeconfig/config; - tail -f /dev/null" - restart: always diff --git a/docker-compose.yml.old11 b/docker-compose.yml.old11 deleted file mode 100644 index df0fcd8..0000000 --- a/docker-compose.yml.old11 +++ /dev/null @@ -1,82 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (KORRIGIERT: Läuft als root, um Docker-Socket-Rechte zu bekommen) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" # <--- WICHTIG: Behebt den "permission denied" Fehler am Docker-Socket - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bullseye,debian-stable:docker://debian:stable-slim - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES INITIALIZER (KORRIGIERT: Erzwingt den echten Binary-Download via GitHub Release) - kind-cluster: - image: alpine:latest - container_name: gitops-test-control-plane - networks: - - test-net - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./kind_kubeconfig:/output_kubeconfig - entrypoint: > - sh -c "apk add --no-cache wget docker-cli ca-certificates; - update-ca-certificates; - wget --no-check-certificate https://github.com -O /usr/local/bin/kind; - chmod +x /usr/local/bin/kind; - if ! /usr/local/bin/kind get clusters 2>/dev/null | grep -q gitops-test; then - /usr/local/bin/kind create cluster --name gitops-test --image kindest/node:v1.28.0; - fi; - /usr/local/bin/kind get kubeconfig --name gitops-test > /output_kubeconfig/config; - tail -f /dev/null" - restart: always - diff --git a/docker-compose.yml.old12 b/docker-compose.yml.old12 deleted file mode 100644 index e97ca5e..0000000 --- a/docker-compose.yml.old12 +++ /dev/null @@ -1,88 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://debian:stable-slim,debian-stable:docker://debian:stable-slim - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES INITIALIZER (KORRIGIERT: Cgroup-Kompatibilität für Devuan/elogind) - kind-cluster: - image: alpine:latest - container_name: kind-initializer - networks: - - test-net - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /sys/fs/cgroup:/sys/fs/cgroup:ro # Reicht die Host-Cgroups schreibgeschützt durch - - ./kind_kubeconfig:/output_kubeconfig - entrypoint: > - sh -c "apk add --no-cache wget docker-cli ca-certificates; - update-ca-certificates; - wget -q --show-progress https://github.com -O /usr/local/bin/kind; - chmod +x /usr/local/bin/kind; - if ! /usr/local/bin/kind get clusters 2>/dev/null | grep -q gitops-test; then - # HIER: Wir erzwingen die Host-Cgroup-Namespaces für systemd-freie Systeme - /usr/local/bin/kind create cluster --name gitops-test --image kindest/node:v1.28.0 --kubeadm-config=/dev/stdin < /output_kubeconfig/config; - tail -f /dev/null" - restart: always diff --git a/docker-compose.yml.old13 b/docker-compose.yml.old13 deleted file mode 100644 index 4c6291b..0000000 --- a/docker-compose.yml.old13 +++ /dev/null @@ -1,82 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO (Git Server + Registry) - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (Pipeline-Ausführung) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://debian:stable-slim,debian-stable:docker://debian:stable-slim - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./kind_kubeconfig:/root/.kube # Reicht die K3s-Config an Terraform weiter - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES PLATTFORM (K3s: Voll kompatibel mit Devuan/elogind) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" # Kubernetes-API für dein lokales Terraform - - "8080:80" # Hierüber erreichst du deine Webapp-Updates von aussen - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output # Schreibt die Zugangsdaten direkt in dein Projektverzeichnis - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old14 b/docker-compose.yml.old14 deleted file mode 100644 index 04a6368..0000000 --- a/docker-compose.yml.old14 +++ /dev/null @@ -1,85 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (KORRIGIERT: Zwingt Pipeline-Container in das richtige Netzwerk) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://debian:stable-slim,debian-stable:docker://debian:stable-slim - # --- HIER IST DIE RETTUNG --- - # Erzwingt, dass alle vom Runner gestarteten Job-Container das Netzwerk teilen - - AM_CONTAINER_NETWORK=gitops-test-network - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES PLATTFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old15 b/docker-compose.yml.old15 deleted file mode 100644 index b19769c..0000000 --- a/docker-compose.yml.old15 +++ /dev/null @@ -1,84 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (KORRIGIERT: Lädt die Netzwerkkonfiguration beim Start) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - # HIER: Wir hängen das --config Flag an den Daemon-Befehl an! - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=http://localhost:3000 # Wechseln auf localhost, da network: host genutzt wird - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml # <--- Reicht die Config-Datei hinein - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES PLATTFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old16 b/docker-compose.yml.old16 deleted file mode 100644 index 7887bba..0000000 --- a/docker-compose.yml.old16 +++ /dev/null @@ -1,85 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (KORRIGIERT: Schlafmodus aktiv für die manuelle Registrierung) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - #command: ["tail -f /dev/null"] # <--- Zwingt den Container aktiv zu bleiben ohne Absturz! - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=http://localhost:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=juwV1ORFDdKzsazRavmsQ6BTdR0MRSDJJ6R1Maik - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - - /usr/local/bin/terraform:/usr/local/bin/terraform - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES PLATTFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old16.autoregisteruseless b/docker-compose.yml.old16.autoregisteruseless deleted file mode 100644 index 2967d78..0000000 --- a/docker-compose.yml.old16.autoregisteruseless +++ /dev/null @@ -1,84 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://forgejo:3000 # <--- Einheitlich im Docker-Netzwerk - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data - restart: always - - # 2. FORGEJO RUNNER (KORRIGIERT: Vollautomatische Registrierung beim Booten) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - # Der Trick: Er prüft, ob eine Config existiert. Wenn nicht, registriert er sich vollautomatisch selbst! - entrypoint: > - sh -c "if [ ! -f /data/.runner ]; then - forgejo-runner register --instance http://forgejo:3000 --token mysecrettoken123 --name debian-local-runner --labels ubuntu-latest:docker://ghcr.io/devops-infra/docker-terraform:latest --no-interactive; - fi; - exec forgejo-runner daemon" - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=mysecrettoken123 # <--- Wir fixieren das Token einfach! - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES PLATTFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old17 b/docker-compose.yml.old17 deleted file mode 100644 index ee05301..0000000 --- a/docker-compose.yml.old17 +++ /dev/null @@ -1,96 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - # WICHTIG: Die Root-URL zeigt nun auf das sichere HTTPS-Eingangstor von Caddy - - FORGEJO__SERVER__ROOT_URL=https://forgejo - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY (KORRIGIERT: Garantiert echtes, lokales SSL für Docker) - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - - test-net - ports: - - "3000:443" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - - # 3. FORGEJO RUNNER - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - # Greift nun verschlüsselt und absolut regelkonform über Caddy auf Forgejo zu - - GITEA_INSTANCE_URL=https://caddy - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - caddy - restart: always - - # 4. KUBERNETES PLATTFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old18 b/docker-compose.yml.old18 deleted file mode 100644 index 340d453..0000000 --- a/docker-compose.yml.old18 +++ /dev/null @@ -1,93 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=https://localhost:3000 # Zeigt nun auf das sichere Nginx-Tor - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY (Behebt die Docker SSL-Probleme) - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - - test-net - ports: - - "3000:443" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - # 3. FORGEJO RUNNER (KORRIGIERT: Verweist nun sauber auf nginx statt caddy) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=https://nginx # Geht verschlüsselt über Nginx zu Forgejo - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - nginx # <--- KORRIGIERT: Hier stand vorher caddy! - restart: always - - # 4. KUBERNETES PLATTFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old19 b/docker-compose.yml.old19 deleted file mode 100644 index d207a20..0000000 --- a/docker-compose.yml.old19 +++ /dev/null @@ -1,95 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO (Git Server, Container Registry & Pipeline-Zentrale) - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://forgejo:3000 # Wichtig für internen, fehlerfreien Pipeline-Checkout - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY (Bedient den HTTPS-Zwang des Docker-Logins/Pushs) - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - - test-net - ports: - - "3000:443" # Der verschlüsselte HTTPS-Port für deine Pipeline ('docker login localhost:3000') - - "3005:80" # Der unverschlüsselte Fallback-Port für deinen bequemen Browser-SSH-Tunnel - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - # 3. FORGEJO RUNNER (Der lokale Pipeline-Arbeiter im Schlafmodus für Registrierung) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - #command: ["tail -f /dev/null"] # <--- Schlafmodus aktiv für deine manuelle Registrierung via Host - command: ["forgejo-runner daemon"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=juwV1ORFDdKzsazRavmsQ6BTdR0MRSDJJ6R1Maik - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - nginx - restart: always - - # 4. KUBERNETES PLATFORM (K3s: Voll kompatibel mit Devuan/elogind Cgroups) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" # Für dein lokales Host-Terraform - - "8080:80" # Hierüber rufst du deine Webapp-Änderungen auf - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old20 b/docker-compose.yml.old20 deleted file mode 100644 index 6233edc..0000000 --- a/docker-compose.yml.old20 +++ /dev/null @@ -1,93 +0,0 @@ -networks: - test-net: - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO (Git Server, Container Registry & Pipeline-Zentrale) - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://forgejo:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY (Bedient den HTTPS-Zwang des Docker-Logins/Pushs via Port 3000) - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - - test-net - ports: - - "3005:443" # Verschlüsseltes SSL-Tor für Docker (nginx:443 intern) - - "3000:80" # Unverschlüsselter Port für deinen SSH-Tunnel-Browser - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - # 3. FORGEJO RUNNER (Der lokale Pipeline-Arbeiter im Testnetzwerk) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - nginx - restart: always - - # 4. KUBERNETES PLATFORM (K3s: Isoliert im selben Netzwerk) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" # Für Host-Terraform - - "8080:80" # Hierüber rufst du deine Webapp auf - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old21 b/docker-compose.yml.old21 deleted file mode 100644 index 167cfee..0000000 --- a/docker-compose.yml.old21 +++ /dev/null @@ -1,96 +0,0 @@ -networks: - test-net: - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO (Git Server, Container Registry & Pipeline-Zentrale) - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://forgejo:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY (Bedient den HTTPS-Zwang des Docker-Logins/Pushs via Port 3000) - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - - test-net - aliases: - - registry.local - ports: - - "3005:443" # Verschlüsseltes SSL-Tor für Docker (nginx:443 intern) - - "3000:80" # Unverschlüsselter Port für deinen SSH-Tunnel-Browser - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - # 3. FORGEJO RUNNER (Der lokale Pipeline-Arbeiter im Testnetzwerk) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - nginx - restart: always - - # 4. KUBERNETES PLATFORM (K3s: Vertraut jetzt deiner lokalen Nginx-CA über HTTPS) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - - ./nginx_ssl/nginx.crt:/etc/containerd/certs.d/registry.local/ca.crt:ro - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old22 b/docker-compose.yml.old22 deleted file mode 100644 index 78643b1..0000000 --- a/docker-compose.yml.old22 +++ /dev/null @@ -1,96 +0,0 @@ -networks: - test-net: - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://forgejo:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - test-net: - aliases: - - registry.local - ports: - - "3005:443" - - "3000:80" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - # 3. FORGEJO RUNNER - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - nginx - restart: always - - # 4. KUBERNETES PLATFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - - ./nginx_ssl/nginx.crt:/etc/containerd/certs.d/registry.local/ca.crt:ro - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old23 b/docker-compose.yml.old23 deleted file mode 100644 index 4b6ed20..0000000 --- a/docker-compose.yml.old23 +++ /dev/null @@ -1,99 +0,0 @@ -networks: - test-net: - name: gitops-test-network - -volumes: - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://forgejo:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - volumes: - - forgejo-data:/data - restart: always - - # 2. NGINX REVERSE PROXY - nginx: - image: nginx:alpine - container_name: nginx-proxy - networks: - test-net: - aliases: - - registry.local - ports: - - "3005:443" - - "3000:80" - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf:ro - - ./nginx_ssl:/etc/nginx/ssl:ro - restart: always - - # 3. FORGEJO RUNNER - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - user: "0:0" - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon --config /data/runner-config.yml"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - - ./runner-config.yaml:/data/runner-config.yml - - ./kind_kubeconfig:/root/.kube - depends_on: - - forgejo - - nginx - restart: always - - # 4. KUBERNETES PLATFORM (K3s) - k3s-cluster: - image: rancher/k3s:v1.28.2-k3s1 - container_name: local-k3s-platform - networks: - - test-net - privileged: true - tmpfs: - - /run - - /var/run - ports: - - "8443:6443" - - "8080:80" - environment: - - K3S_KUBECONFIG_OUTPUT=/output/config - - K3S_KUBECONFIG_MODE=666 - volumes: - - ./kind_kubeconfig:/output - # 1. Für die containerd-Runtime spezifisch - - ./nginx_ssl/nginx.crt:/etc/containerd/certs.d/registry.local/ca.crt:ro - # 2. DIE SYSTEMWEITE RETTUNG: Verankert die CA direkt im Linux-Zertifikatsspeicher des K3s-Betriebssystems! - - ./nginx_ssl/nginx.crt:/usr/local/share/ca-certificates/registry-ca.crt:ro - command: server --disable traefik --egress-selector-mode=disabled - restart: always diff --git a/docker-compose.yml.old9 b/docker-compose.yml.old9 deleted file mode 100644 index 5f2b285..0000000 --- a/docker-compose.yml.old9 +++ /dev/null @@ -1,81 +0,0 @@ -networks: - test-net: - driver: bridge - name: gitops-test-network - -volumes: - # Erzeugt die Ordner lokal und korrigiert automatisch die Docker-Berechtigungen - forgejo-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/forgejo_data - runner-data: - driver: local - driver_opts: - type: none - o: bind - device: ${PWD}/runner_data - -services: - # 1. FORGEJO (Git Server + Registry) - forgejo: - image: data.forgejo.org/forgejo/forgejo:9 - container_name: forgejo - networks: - - test-net - environment: - - FORGEJO__SERVER__HTTP_PORT=3000 - - FORGEJO__SERVER__ROOT_URL=http://localhost:3000 - - FORGEJO__ACTIONS__ENABLED=true - - FORGEJO__PACKAGES__ENABLED=true - - FORGEJO__PACKAGES__CONTAINER_ENABLED=true - ports: - - "3000:3000" - - "3005:3000" - - "2222:22" - volumes: - - forgejo-data:/data # Nutzt das sichere Named-Volume - restart: always - - # 2. FORGEJO RUNNER (Pipeline-Ausführung) - forgejo-runner: - image: data.forgejo.org/forgejo/runner:9 - container_name: forgejo-runner - networks: - - test-net - entrypoint: ["/bin/sh", "-c"] - command: ["forgejo-runner daemon"] - #command: ["tail -f /dev/null"] - environment: - - GITEA_INSTANCE_URL=http://forgejo:3000 - - GITEA_RUNNER_REGISTRATION_TOKEN=z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS - - GITEA_RUNNER_NAME=debian-local-runner - - GITEA_RUNNER_LABELS=ubuntu-latest:docker://node:20-bullseye,debian-stable:docker://debian:stable-slim - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - runner-data:/data - depends_on: - - forgejo - restart: always - - # 3. KUBERNETES INITIALIZER (Flüchtiger Test-Cluster) - kind-cluster: - image: alpine:latest - container_name: gitops-test-control-plane - networks: - - test-net - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - ./kind_kubeconfig:/output_kubeconfig - entrypoint: > - sh -c "apk add --no-cache curl docker-cli; - curl -sfL https://k8s.io -o /usr/local/bin/kind; - chmod +x /usr/local/bin/kind; - if ! /usr/local/bin/kind get clusters 2>/dev/null | grep -q gitops-test; then - /usr/local/bin/kind create cluster --name gitops-test --image kindest/node:v1.28.0; - fi; - /usr/local/bin/kind get kubeconfig --name gitops-test > /output_kubeconfig/config; - tail -f /dev/null" - restart: always diff --git a/forgejo_data/git/repositories/bast/mytfenv.git/info/refs b/forgejo_data/git/repositories/bast/mytfenv.git/info/refs index e69de29..f44acf7 100644 --- a/forgejo_data/git/repositories/bast/mytfenv.git/info/refs +++ b/forgejo_data/git/repositories/bast/mytfenv.git/info/refs @@ -0,0 +1 @@ +c5e06f402f19e600aa57d63f824d556ef73f4b03 refs/heads/main diff --git a/forgejo_data/git/repositories/bast/mytfenv.git/objects/info/packs b/forgejo_data/git/repositories/bast/mytfenv.git/objects/info/packs index 8b13789..cc661ca 100644 --- a/forgejo_data/git/repositories/bast/mytfenv.git/objects/info/packs +++ b/forgejo_data/git/repositories/bast/mytfenv.git/objects/info/packs @@ -1 +1,2 @@ +P pack-fe40805e21f1a034d4fb9912dd66a58bfe0334f9.pack diff --git a/forgejo_data/gitea/gitea.db b/forgejo_data/gitea/gitea.db index e5da060171175a42be0e758ae362adeb1f8ef4c3..14f4e6f0e65dacbe86f2416f499c6177843d8f32 100644 GIT binary patch delta 1594 zcmcK2Z)_7~90%}wo_o5xr|tE(t=$G2(xdDT$ktxhb^lP)AR2MSIrXK>)~>DF+~2kf zzLG_@4vir*i@9K8oQaIY5bQGCB_=|GiNPoc;|&qf8RG(Du|P;*0_yK3@z1-x@x|xv za`%0n-}5}b8(q9jM$u#`ee3CWHtoXeZ0AvTRUzDlMfe83fLVAC-cZ62QyxGg6gwuN z+;QKrPg!uBgO)k3x}uQjsWR_4b6gWPOnv07By8$yubb?iy6)ZaoYgLFB++DKpsSmv zBZUreJBf6qdjaf$(wj1LWV^bEw}uf>xcsdOYg zlA;Gp zoA5Wq>oqMB2{y#)1Bu4kx>zt+A5Sy{5_M56@XV88`C9MN@QKGob1W|r*FW~f?s#9H z@Yy|ccoUU{Jl@W+wtmx9vrYf>6R8!KxFEnyxC#sKy;0CfPD3$g#7QWYWj01i2wj^* z)UTeBHevjd0JmTnF2SN1KLdr5=p<&CizVb?bopDU6r)!JxC=R0f-7e9Eal!`ETU4Z*=2bXc(3|@vJi%1A%YgdtpoKR8Zd`2VMOo-&qcM_6skdSOS zpI0rwA*jZ)Re^Nsem5`EKX&s{J>llA4VIzjkDCTY`ubAc5r6N}(05pO);Q$muZ|vF zZRM)5dWzo%+wd%vM8rmYaWFU1-M{nH=HNvoSOaFu6e1& z?8LfTXj~Yy2J#IyZMy|lg4>~t@wE-9nXEOFwPmvQ`K)r!L6brK!AYeI??&k<<+6qk z6L)e7av(tYr~nlrCvu@8RBYVIl_)o43T*-$fi^sor{JX*s3MS}_6jb`GGmPPM|uX< z`{N~glBu-XHQ3+Zlg4A)in1pCNNz(1)>#p-XDepM7Qtm@q=>9dPi4l7xLIf>#MK$q zs%AnPGojK>gbjRo@lunq6-@U(t>&skG@&ysg>_hG)Zy#0ldvp=P6741E2iD2A0~ zU7Ex($}L5YOgCvbrcB9~EW}KPAKqJx-`-cP6f1m=YceaGv17XSWlW#86iu&rSr`+P zeb!&)otA_254u9X62_(qvVDbPyTXdV@n4eV9rD4w%tH0Hk@E7;dYkL1_Uw(PQju5U zo@UR#I<5PwJudx&JymbY{)XmYZL_~g?|;2q{a+^5o~GT6bJD6{bqFLH}1?^^H2Gwb}CD)T-U7B3>%_L5(yn8TX)^U)K*Ky>y|VY zgc?f>1c5}_MRLR1->EzVb?C2k35~K#SZ%2#n3dEU?N9@snc+L{&3iMEsd*AX{n_-w z?Mu1)@O-QOh9}<*^DqUE;Xd4gD{xjj2qA3=%3;6W4|)18y-RzcKh+0Dy+%SKAEG(l zb5drSSQ@?V-Ariok=H{qqo2H64?&HfvrzDOyZ_{|j=(BiEF^)3juWk6|LM-Kzo|7C zQd7jNzgabNiCHXoIuLGXgmxi=t&}RNxSDkZIvN_gL&ZIzVuC0Vk%W>^G7lBY18oY0 zZUOE=H&3l6U7%J_MPPL-jY{@hdQpLWXGE^SnrQ*%VA`p94fgbyoGVlKD8N^+0|OO4 zZq$SaaG`(+|aPVFaYmUf_P*GG^++>R$zBq<6Qrae{ zEK02D{egG!2wU9C7i*a8jvK0ECKDJJVBA^#A@K25wG7JH@SDrnlP5SVrXJJM|Is)WIsc02SL+L03W%7lY)!Hmh928*Cnb->3 z&PYTTSVr9$=6s?gNhbp*!sR={L~~OAKVh)M9-LX@$MyvQ7M%9az!ZsPFsEh6)J@CG zvdnDD%(2W|%Uo-j>nzg~Hx0=UtMxux9&la8pZZO+`-?#0(KoJBb zjPg+dDnwh*Rv diff --git a/forgejo_data/gitea/queues/common/000073.log b/forgejo_data/gitea/queues/common/000073.log index b049aa23090e03cb2e4b7824efe7ba5d8614a19f..647e7841703473458292d1471658a463f3afb0e3 100644 GIT binary patch literal 2243 zcmb7_TSyd97{|{E1cj`JE>IfESRl2lv-e%|sl-@93$qBiY_skecVaKLGn1J}QJ^3} z7YH8$DItQ0!UrFu-g@b#dCN@gUS8^{lFBgZTb+?_S!Q+5!?Jt!{Qlpb-+t#z+sNtB z5<;J3koiI3m2MMi6e${!eK95k8hpp2e%}d|sm!NFBzR+PcT)JiuO zuFfhVv=@P7$_ zP4>M<_iuviQ3M*x)@!$St~Ennj$tS*S=}Aq;FD!< z?KhY-w5>ylw%scV3c&VT9FfxYoMzj7zNQy!zeAw0ZN2uiclaULevhHFY+ty%VYivk z4=8}HuT$lqPpu0G3R}3V7p~e%+Al3Ft18+`=|{|LOlI`uXIC6*bi%I)X zDTEnU!ubVR;Y?f=tBdZJSuA;0n+Z24B8!}yUn-WXp^!EoW1?IfglCIf92TSqe7`3Y z*clCnB_&>t!=_x78kSIGjv$*+jdaw*go! zg;}K#iNfw&9-H0mvbuSP&Ed2=Jr;Y@kspr-ZAdfUr|=l6C59cgEEP!Tmvex1$NACI=~Y;g-N4& tX1x)p^^A8_EgX(%jO7>=#5!i0Pi=<7@dbfo$$C>|tp@@6x*TXx%75ivY5)KL delta 7 OcmX>sxQTniCRP9p;R5*p diff --git a/nginx.conf.old b/nginx.conf.old deleted file mode 100644 index 94b8758..0000000 --- a/nginx.conf.old +++ /dev/null @@ -1,37 +0,0 @@ -events { worker_connections 1024; } - -http { - # Erlaubt das Hochladen großer Docker-Images ohne Limits - client_max_body_size 0; - - # BLOCK 1: HTTPS (Port 443) - Für den verschlüsselten Docker-Login deiner Pipeline - server { - listen 443 ssl; - server_name localhost; - - ssl_certificate /etc/nginx/ssl/nginx.crt; - ssl_certificate_key /etc/nginx/ssl/nginx.key; - - location / { - proxy_pass http://forgejo:3000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } - - # BLOCK 2: HTTP (Port 80) - Für deinen bequemen SSH-Tunnel auf Port 3005 - server { - listen 80; - server_name localhost; - - location / { - proxy_pass http://forgejo:3000; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } -} diff --git a/nginx.conf.old2 b/nginx.conf.old2 deleted file mode 100644 index 20ed1e0..0000000 --- a/nginx.conf.old2 +++ /dev/null @@ -1,41 +0,0 @@ -events { worker_connections 1024; } - -http { - client_max_body_size 0; - - # Aktiviert den internen Docker-DNS-Server für dynamische IP-Updates - resolver 127.0.0.11 valid=5s; - - # BLOCK 1: HTTPS (Port 443) - server { - listen 443 ssl; - server_name localhost; - - ssl_certificate /etc/nginx/ssl/nginx.crt; - ssl_certificate_key /etc/nginx/ssl/nginx.key; - - location / { - set $upstream_forgejo http://forgejo:3000; - proxy_pass $upstream_forgejo; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } - - # BLOCK 2: HTTP (Port 80) - Für deinen SSH-Tunnel - server { - listen 80; - server_name localhost; - - location / { - set $upstream_forgejo http://forgejo:3000; - proxy_pass $upstream_forgejo; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - } - } -} diff --git a/register-runnser.sh b/register-runner.sh similarity index 100% rename from register-runnser.sh rename to register-runner.sh diff --git a/register-runnser.sh.old b/register-runnser.sh.old deleted file mode 100755 index f78617e..0000000 --- a/register-runnser.sh.old +++ /dev/null @@ -1,6 +0,0 @@ -docker compose exec forgejo-runner forgejo-runner register \ - --instance http://forgejo:3000 \ - --token z6xlwg3dSRYZ59zUxfrztDJasG6VkvulFyTwtJQS \ - --name debian-local-runner \ - --labels ubuntu-latest:docker://docker:24-cli,debian-stable:docker://docker:24-cli \ - --no-interactive