Compare commits
44
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2d21e93c8
|
||
|
|
c02644b48d
|
||
|
|
a1d22ce71f
|
||
|
|
10dc412566
|
||
|
|
68c1b07b23
|
||
|
|
25e076ba18
|
||
|
|
a0ffe731bf
|
||
|
|
9a2a1730dd
|
||
|
|
851c863b24
|
||
|
|
0d811cfb75
|
||
|
|
bd374b95fc
|
||
|
|
223ed09d94
|
||
|
|
54f74a2f2a
|
||
|
|
736dc1f2e5
|
||
|
|
2c232ec953
|
||
|
|
451abe83c0
|
||
|
|
8ef3ad28a0
|
||
|
|
24955f75b5
|
||
|
|
d44930de7e
|
||
|
|
819772d00d
|
||
|
|
d873619a6f
|
||
|
|
62e50748da
|
||
|
|
66279df701
|
||
|
|
a88d7d7723
|
||
|
|
5923b9f6a4
|
||
|
|
2e852a2a48
|
||
|
|
c2da58c74e
|
||
|
|
d042137d36
|
||
|
|
b7a2e60790
|
||
|
|
0aa20c7362
|
||
|
|
ad6de96d14
|
||
|
|
e3e12afa0d
|
||
|
|
8595977d90
|
||
|
|
abdd2f5df8
|
||
|
|
52377f71f8
|
||
|
|
a2fb03197a | ||
|
|
f99e621d3b
|
||
|
|
896800da6a | ||
|
|
a34e5520d0 | ||
|
|
589d0f6be1 | ||
|
|
837eab18b0 | ||
|
|
c6a70180fe | ||
|
|
071bd70a72 | ||
|
|
d07bb324d8 |
@@ -0,0 +1,154 @@
|
||||
name: Main Release & Publish
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
|
||||
jobs:
|
||||
release-and-publish:
|
||||
name: Build, Publish Packages (Stable) & Create Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Install Rust Toolchain
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: stable
|
||||
cache: false
|
||||
|
||||
- name: Install Packaging Tools (Prebuilt Binaries)
|
||||
run: |
|
||||
mkdir -p ~/.cargo/bin
|
||||
curl -fsSL https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz | tar -xz -C ~/.cargo/bin
|
||||
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
|
||||
~/.cargo/bin/cargo-binstall -y --no-symlinks cargo-deb cargo-generate-rpm
|
||||
|
||||
- name: Run Tests
|
||||
run: |
|
||||
cargo test
|
||||
|
||||
- name: Build Release Binary
|
||||
run: |
|
||||
cargo build --release
|
||||
|
||||
- name: Build Debian Package (.deb)
|
||||
run: |
|
||||
cargo deb
|
||||
|
||||
- name: Build Fedora / RPM Package (.rpm)
|
||||
run: |
|
||||
cargo generate-rpm
|
||||
|
||||
- name: Build Arch Linux Package (.pkg.tar.zst)
|
||||
run: |
|
||||
python3 scripts/package-arch.py
|
||||
|
||||
- name: Publish Packages to Gitea Package Registry
|
||||
env:
|
||||
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||
REPO_OWNER: ${{ gitea.repository_owner || github.repository_owner }}
|
||||
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||
run: |
|
||||
echo "Veröffentliche Debian-Paket (Distribution: stable, Component: main)..."
|
||||
for deb in target/debian/*.deb; do
|
||||
[ -f "$deb" ] || continue
|
||||
curl -f -s -S -X PUT \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
--upload-file "$deb" \
|
||||
"${GITEA_URL}/api/packages/${REPO_OWNER}/debian/pool/stable/main/upload"
|
||||
done
|
||||
|
||||
echo "Veröffentliche Fedora/RPM-Paket (Gruppe: stable)..."
|
||||
for rpm in target/generate-rpm/*.rpm; do
|
||||
[ -f "$rpm" ] || continue
|
||||
curl -f -s -S -X PUT \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
--upload-file "$rpm" \
|
||||
"${GITEA_URL}/api/packages/${REPO_OWNER}/rpm/stable/upload"
|
||||
done
|
||||
|
||||
echo "Veröffentliche Arch Linux-Paket (Repository: stable)..."
|
||||
for pkg in target/arch/*.pkg.tar.zst; do
|
||||
[ -f "$pkg" ] || continue
|
||||
curl -f -s -S -X PUT \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
--upload-file "$pkg" \
|
||||
"${GITEA_URL}/api/packages/${REPO_OWNER}/arch/stable"
|
||||
done
|
||||
|
||||
- name: Create Gitea Release and Upload Assets
|
||||
env:
|
||||
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||
REPO: ${{ gitea.repository || github.repository }}
|
||||
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||
run: |
|
||||
VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||
TAG_NAME="v${VERSION}"
|
||||
RELEASE_TITLE="Release ${TAG_NAME}"
|
||||
RELEASE_NOTES="Automatisches Release für docker-update ${VERSION}."
|
||||
|
||||
echo "Erstelle oder hole Release für Tag ${TAG_NAME} in ${REPO}..."
|
||||
|
||||
GET_RESP=$(curl -s -w "\n%{http_code}" \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/tags/${TAG_NAME}")
|
||||
HTTP_CODE=$(echo "$GET_RESP" | tail -n1)
|
||||
BODY=$(echo "$GET_RESP" | sed '$d')
|
||||
|
||||
RELEASE_ID=""
|
||||
if [ "$HTTP_CODE" -eq 200 ]; then
|
||||
RELEASE_ID=$(echo "$BODY" | jq -r '.id // empty' 2>/dev/null || echo "$BODY" | grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)
|
||||
echo "Bestehendes Release gefunden (ID: ${RELEASE_ID})."
|
||||
else
|
||||
echo "Erstelle neues Release ${TAG_NAME}..."
|
||||
CREATE_PAYLOAD=$(cat <<EOF
|
||||
{
|
||||
"tag_name": "${TAG_NAME}",
|
||||
"target_commitish": "main",
|
||||
"name": "${RELEASE_TITLE}",
|
||||
"body": "${RELEASE_NOTES}",
|
||||
"draft": false,
|
||||
"prerelease": false
|
||||
}
|
||||
EOF
|
||||
)
|
||||
CREATE_RESP=$(curl -f -s -S -X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$CREATE_PAYLOAD" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases")
|
||||
RELEASE_ID=$(echo "$CREATE_RESP" | jq -r '.id // empty' 2>/dev/null || echo "$CREATE_RESP" | grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)
|
||||
echo "Neues Release erstellt (ID: ${RELEASE_ID})."
|
||||
fi
|
||||
|
||||
if [ -z "$RELEASE_ID" ]; then
|
||||
echo "Fehler: Release-ID konnte nicht ermittelt werden!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
EXISTING_ASSETS_JSON=$(curl -s \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets" || echo "[]")
|
||||
|
||||
for file in target/debian/*.deb target/generate-rpm/*.rpm target/arch/*.pkg.tar.zst; do
|
||||
[ -f "$file" ] || continue
|
||||
filename="$(basename "$file")"
|
||||
echo "Lade Release-Asset hoch: $filename"
|
||||
|
||||
ASSET_ID=$(echo "$EXISTING_ASSETS_JSON" | jq -r --arg name "$filename" '.[]? | select(.name == $name) | .id' 2>/dev/null | head -n1 || true)
|
||||
if [ -n "$ASSET_ID" ] && [ "$ASSET_ID" != "null" ]; then
|
||||
echo "Lösche altes Asset mit ID ${ASSET_ID}..."
|
||||
curl -s -X DELETE \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets/${ASSET_ID}" || true
|
||||
fi
|
||||
|
||||
curl -f -s -S -X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-F "attachment=@${file}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${filename}"
|
||||
echo "Asset ${filename} erfolgreich hochgeladen."
|
||||
done
|
||||
@@ -0,0 +1,154 @@
|
||||
name: Testing Build, Publish & Preview Release
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- testing
|
||||
|
||||
jobs:
|
||||
build-and-publish:
|
||||
name: Build, Publish Packages (Testing) & Create Preview Release
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Checkout Repository
|
||||
uses: actions/checkout@v7
|
||||
|
||||
- name: Install Rust Toolchain
|
||||
uses: actions-rust-lang/setup-rust-toolchain@v1
|
||||
with:
|
||||
toolchain: stable
|
||||
cache: false
|
||||
|
||||
- name: Install Packaging Tools (Prebuilt Binaries)
|
||||
run: |
|
||||
mkdir -p ~/.cargo/bin
|
||||
curl -fsSL https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz | tar -xz -C ~/.cargo/bin
|
||||
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
|
||||
~/.cargo/bin/cargo-binstall -y --no-symlinks cargo-deb cargo-generate-rpm
|
||||
|
||||
- name: Run Tests
|
||||
run: |
|
||||
cargo test
|
||||
|
||||
- name: Build Release Binary
|
||||
run: |
|
||||
cargo build --release
|
||||
|
||||
- name: Build Debian Package (.deb)
|
||||
run: |
|
||||
cargo deb
|
||||
|
||||
- name: Build Fedora / RPM Package (.rpm)
|
||||
run: |
|
||||
cargo generate-rpm
|
||||
|
||||
- name: Build Arch Linux Package (.pkg.tar.zst)
|
||||
run: |
|
||||
python3 scripts/package-arch.py
|
||||
|
||||
- name: Publish Packages to Gitea Package Registry
|
||||
env:
|
||||
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||
REPO_OWNER: ${{ gitea.repository_owner || github.repository_owner }}
|
||||
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||
run: |
|
||||
echo "Veröffentliche Debian-Paket (Distribution: testing, Component: main)..."
|
||||
for deb in target/debian/*.deb; do
|
||||
[ -f "$deb" ] || continue
|
||||
curl -f -s -S -X PUT \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
--upload-file "$deb" \
|
||||
"${GITEA_URL}/api/packages/${REPO_OWNER}/debian/pool/testing/main/upload"
|
||||
done
|
||||
|
||||
echo "Veröffentliche Fedora/RPM-Paket (Gruppe: testing)..."
|
||||
for rpm in target/generate-rpm/*.rpm; do
|
||||
[ -f "$rpm" ] || continue
|
||||
curl -f -s -S -X PUT \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
--upload-file "$rpm" \
|
||||
"${GITEA_URL}/api/packages/${REPO_OWNER}/rpm/testing/upload"
|
||||
done
|
||||
|
||||
echo "Veröffentliche Arch Linux-Paket (Repository: testing)..."
|
||||
for pkg in target/arch/*.pkg.tar.zst; do
|
||||
[ -f "$pkg" ] || continue
|
||||
curl -f -s -S -X PUT \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
--upload-file "$pkg" \
|
||||
"${GITEA_URL}/api/packages/${REPO_OWNER}/arch/testing"
|
||||
done
|
||||
|
||||
- name: Create Gitea Pre-Release and Upload Assets
|
||||
env:
|
||||
GITEA_URL: ${{ gitea.server_url || github.server_url }}
|
||||
REPO: ${{ gitea.repository || github.repository }}
|
||||
TOKEN: ${{ secrets.PACKAGE_TOKEN || secrets.RELEASE_TOKEN || secrets.PUBLISH_TOKEN || secrets.API_TOKEN || secrets.PAT_TOKEN || secrets.CUSTOM_TOKEN || secrets.GITEA_TOKEN || secrets.GITHUB_TOKEN || github.token }}
|
||||
run: |
|
||||
VERSION="$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml | head -n1)"
|
||||
TAG_NAME="v${VERSION}-preview"
|
||||
RELEASE_TITLE="Preview Release ${TAG_NAME}"
|
||||
RELEASE_NOTES="Automatisches Preview-Release für docker-update ${VERSION} (Branch: Testing)."
|
||||
|
||||
echo "Erstelle oder hole Preview-Release für Tag ${TAG_NAME} in ${REPO}..."
|
||||
|
||||
GET_RESP=$(curl -s -w "\n%{http_code}" \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/tags/${TAG_NAME}")
|
||||
HTTP_CODE=$(echo "$GET_RESP" | tail -n1)
|
||||
BODY=$(echo "$GET_RESP" | sed '$d')
|
||||
|
||||
RELEASE_ID=""
|
||||
if [ "$HTTP_CODE" -eq 200 ]; then
|
||||
RELEASE_ID=$(echo "$BODY" | jq -r '.id // empty' 2>/dev/null || echo "$BODY" | grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)
|
||||
echo "Bestehendes Release gefunden (ID: ${RELEASE_ID})."
|
||||
else
|
||||
echo "Erstelle neues Preview-Release ${TAG_NAME}..."
|
||||
CREATE_PAYLOAD=$(cat <<EOF
|
||||
{
|
||||
"tag_name": "${TAG_NAME}",
|
||||
"target_commitish": "testing",
|
||||
"name": "${RELEASE_TITLE}",
|
||||
"body": "${RELEASE_NOTES}",
|
||||
"draft": false,
|
||||
"prerelease": true
|
||||
}
|
||||
EOF
|
||||
)
|
||||
CREATE_RESP=$(curl -f -s -S -X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-H "Content-Type: application/json" \
|
||||
-d "$CREATE_PAYLOAD" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases")
|
||||
RELEASE_ID=$(echo "$CREATE_RESP" | jq -r '.id // empty' 2>/dev/null || echo "$CREATE_RESP" | grep -o '"id":[0-9]*' | head -n1 | cut -d: -f2)
|
||||
echo "Neues Preview-Release erstellt (ID: ${RELEASE_ID})."
|
||||
fi
|
||||
|
||||
if [ -z "$RELEASE_ID" ]; then
|
||||
echo "Fehler: Release-ID konnte nicht ermittelt werden!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
EXISTING_ASSETS_JSON=$(curl -s \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets" || echo "[]")
|
||||
|
||||
for file in target/debian/*.deb target/generate-rpm/*.rpm target/arch/*.pkg.tar.zst; do
|
||||
[ -f "$file" ] || continue
|
||||
filename="$(basename "$file")"
|
||||
echo "Lade Release-Asset hoch: $filename"
|
||||
|
||||
ASSET_ID=$(echo "$EXISTING_ASSETS_JSON" | jq -r --arg name "$filename" '.[]? | select(.name == $name) | .id' 2>/dev/null | head -n1 || true)
|
||||
if [ -n "$ASSET_ID" ] && [ "$ASSET_ID" != "null" ]; then
|
||||
echo "Lösche altes Asset mit ID ${ASSET_ID}..."
|
||||
curl -s -X DELETE \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets/${ASSET_ID}" || true
|
||||
fi
|
||||
|
||||
curl -f -s -S -X POST \
|
||||
-H "Authorization: token ${TOKEN}" \
|
||||
-F "attachment=@${file}" \
|
||||
"${GITEA_URL}/api/v1/repos/${REPO}/releases/${RELEASE_ID}/assets?name=${filename}"
|
||||
echo "Asset ${filename} erfolgreich hochgeladen."
|
||||
done
|
||||
Generated
+28
@@ -0,0 +1,28 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JsonSchemaMappingsProjectConfiguration">
|
||||
<state>
|
||||
<map>
|
||||
<entry key="GitHub Workflow">
|
||||
<value>
|
||||
<SchemaInfo>
|
||||
<option name="name" value="GitHub Workflow" />
|
||||
<option name="relativePathToSchema" value="https://www.schemastore.org/github-workflow.json" />
|
||||
<option name="applicationDefined" value="true" />
|
||||
<option name="patterns">
|
||||
<list>
|
||||
<Item>
|
||||
<option name="path" value=".gitea/workflows/testing.yaml" />
|
||||
</Item>
|
||||
<Item>
|
||||
<option name="path" value=".gitea/workflows/main.yaml" />
|
||||
</Item>
|
||||
</list>
|
||||
</option>
|
||||
</SchemaInfo>
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</state>
|
||||
</component>
|
||||
</project>
|
||||
@@ -27,16 +27,17 @@ lädt diese herunter, startet betroffene Services neu und bereinigt ungenutzte Z
|
||||
|
||||
```text
|
||||
DockerUpdate/
|
||||
├── Cargo.toml # Rust-Manifest, Abhängigkeiten und Metadaten für cargo-deb / generate-rpm
|
||||
├── .gitea/
|
||||
│ └── workflows/
|
||||
│ ├── testing.yaml # CI/CD für testing-Branch (Tests, Testing-Packages & Preview-Release)
|
||||
│ └── main.yaml # CI/CD für main-Branch (Tests, Stable-Packages & Release)
|
||||
├── scripts/
|
||||
│ └── package-arch.py # Hilfsskript zur Arch-Linux-Paketerstellung (.pkg.tar.zst)
|
||||
├── Cargo.toml # Rust-Manifest, Abhängigkeiten und Metadaten für deb / generate-rpm / arch
|
||||
├── Cargo.lock
|
||||
├── LICENSE # GPL-3.0 Lizenztext
|
||||
├── README.md # Projektdokumentation für Endanwender und Administratoren
|
||||
├── AGENTS.md # Richtlinien und Dokumentation für Agenten
|
||||
├── packaging/
|
||||
│ ├── arch/
|
||||
│ │ └── PKGBUILD # Arch Linux PKGBUILD
|
||||
│ └── fedora/
|
||||
│ └── docker-update.spec # RPM-Spec für Fedora / RHEL / CentOS
|
||||
└── src/
|
||||
├── main.rs # Einstiegspunkt, Root-Prüfung, Ausführung
|
||||
├── program.rs # Hilfsfunktion zur Programmnamensermittlung
|
||||
@@ -70,6 +71,14 @@ DockerUpdate/
|
||||
- **`src/sudo.rs`**:
|
||||
- `is_run_as_root()`: Nutzt `libc::geteuid() == 0`.
|
||||
- `run_as_root()`: Führt `sudo <args>` per `exec` aus.
|
||||
- **`.gitea/workflows/`**:
|
||||
- `testing.yaml`: Führt bei Push auf `testing` Tests und Builds durch, veröffentlicht Pakete in der Gitea Package
|
||||
Registry
|
||||
(`distribution: testing`, `component: main` bzw. Gruppe/Repo `testing`) und erstellt ein Gitea Preview-Release mit
|
||||
den Paketen als Assets.
|
||||
- `main.yaml`: Führt bei Push auf `main` Tests und Builds durch, veröffentlicht Pakete in der Gitea Package Registry
|
||||
(`distribution: stable`, `component: main` bzw. Gruppe/Repo `stable`) und erstellt ein Gitea Release mit den
|
||||
Paketen als Assets.
|
||||
|
||||
---
|
||||
|
||||
@@ -88,17 +97,33 @@ cargo test
|
||||
cargo build --release
|
||||
```
|
||||
|
||||
### Optionale Paketierungsbefehle (lokale Validierung)
|
||||
|
||||
```bash
|
||||
# Debian-Paket (.deb) erstellen (benötigt cargo-deb)
|
||||
cargo deb
|
||||
|
||||
# Fedora / RPM-Paket (.rpm) erstellen (benötigt cargo-generate-rpm)
|
||||
cargo generate-rpm
|
||||
|
||||
# Arch Linux-Paket (.pkg.tar.zst) erstellen
|
||||
python3 scripts/package-arch.py
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. Richtlinien für Änderungen
|
||||
|
||||
1. **Abwärtskompatibilität & Pfade**:
|
||||
Der Standard-Apps-Pfad `/var/apps` und die Konfigurationspfade dürfen nicht ohne triftigen Grund geändert werden.
|
||||
2. **Paketierungsdefinitionen synchron halten**:
|
||||
Werden Abhängigkeiten oder Assets geändert, müssen `Cargo.toml` (`[package.metadata.deb]`,
|
||||
`[package.metadata.generate-rpm]`), `packaging/arch/PKGBUILD` und `packaging/fedora/docker-update.spec` entsprechend
|
||||
aktualisiert werden.
|
||||
2. **Paketierungsdefinitionen in Cargo.toml pflegen**:
|
||||
Alle Paketierungsdefinitionen für Debian, RPM und Arch Linux werden zentral in `Cargo.toml` verwaltet
|
||||
(`[package.metadata.deb]`, `[package.metadata.generate-rpm]`, `[package.metadata.arch]`). Es wird kein separater
|
||||
`packaging/`-Ordner benötigt.
|
||||
3. **Automatisierung**:
|
||||
Die empfohlene Automatisierungsmethode ist **Cron** (`/etc/cron.d/docker-update` oder `crontab -e`).
|
||||
4. **Keine Mocking-Bypässe**:
|
||||
Tests dürfen nicht gelöscht, ignoriert oder durch leere Dummy-Assertions ersetzt werden.
|
||||
5. **CI/CD & Release-Konsistenz**:
|
||||
Workflows in `.gitea/workflows/` müssen bei strukturellen Paket- oder Release-Anpassungen konsistent zu `Cargo.toml`
|
||||
gehalten werden.
|
||||
|
||||
Generated
+1
-1
@@ -29,7 +29,7 @@ checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
|
||||
|
||||
[[package]]
|
||||
name = "docker-update"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
dependencies = [
|
||||
"confy",
|
||||
"libc 1.0.0-alpha.4",
|
||||
|
||||
+8
-2
@@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "docker-update"
|
||||
version = "0.1.0"
|
||||
version = "1.0.0"
|
||||
edition = "2024"
|
||||
authors = ['DragonSlayer_14']
|
||||
readme = "README.md"
|
||||
@@ -24,7 +24,7 @@ maintainer = "DragonSlayer_14"
|
||||
copyright = "2026 Linuxapps"
|
||||
section = "utils"
|
||||
priority = "optional"
|
||||
depends = "$auto, sudo, docker.io | docker-ce"
|
||||
depends = "$auto, sudo, docker-ce-cli, docker-compose-plugin"
|
||||
extended-description = """\
|
||||
DockerUpdate durchsucht Verzeichnisse (standardmäßig in /var/apps) nach
|
||||
Docker-Compose-Dateien mit ':latest'-Images, prüft auf neuere Images,
|
||||
@@ -43,3 +43,9 @@ assets = [
|
||||
{ source = "LICENSE", dest = "/usr/share/licenses/docker-update/LICENSE", mode = "644", license = true },
|
||||
]
|
||||
requires = { "sudo" = "*", "docker" = "*" }
|
||||
|
||||
[package.metadata.arch]
|
||||
pkgrel = "1"
|
||||
arch = "x86_64"
|
||||
depends = ["gcc-libs", "glibc", "sudo", "docker-ce-cli", "docker-compose-plugin"]
|
||||
optdepends = ["docker-compose: Unterstützung für Docker Compose v1"]
|
||||
|
||||
@@ -38,6 +38,164 @@ auf neuere Versionen prüft, aktualisiert und neu startet.
|
||||
|
||||
---
|
||||
|
||||
## Installation aus der Gitea-Paket-Registry
|
||||
|
||||
Über die CI/CD-Pipelines werden bei jedem Push auf den `main`-Branch (Release / Stable) und `testing`-Branch (Preview /
|
||||
Testing) automatisch Pakete für **Debian/Ubuntu**, **Fedora/RHEL** und **Arch Linux** in der Gitea-Paket-Registry
|
||||
bereitgestellt.
|
||||
|
||||
### 1. Debian / Ubuntu (`apt`)
|
||||
|
||||
#### Stable (Produktiv)
|
||||
|
||||
Füge das Repository zu deinen APT-Quellen hinzu:
|
||||
|
||||
```bash
|
||||
# Keyring installieren
|
||||
sudo curl https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/debian/repository.key -o /etc/apt/keyrings/gitea-Linuxapps.asc
|
||||
# Repository-Eintrag anlegen
|
||||
echo "deb [signed-by=/etc/apt/keyrings/gitea-Linuxapps.asc] https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/debian stable main" | sudo tee -a /etc/apt/sources.list.d/gitea.list
|
||||
|
||||
# Paketliste aktualisieren und installieren
|
||||
sudo apt update
|
||||
sudo apt install docker-update
|
||||
```
|
||||
|
||||
#### Testing (Vorschau / Testing)
|
||||
|
||||
```bash
|
||||
# Keyring installieren
|
||||
sudo curl https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/debian/repository.key -o /etc/apt/keyrings/gitea-Linuxapps.asc
|
||||
# Testing-Repository-Eintrag anlegen
|
||||
echo "deb [signed-by=/etc/apt/keyrings/gitea-Linuxapps.asc] https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/debian testing main" | sudo tee -a /etc/apt/sources.list.d/gitea.list
|
||||
|
||||
# Paketliste aktualisieren und installieren
|
||||
sudo apt update
|
||||
sudo apt install docker-update
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 2. RedHat / Fedora / SUSE
|
||||
|
||||
#### Stable (Produktiv)
|
||||
|
||||
Repository einrichten:
|
||||
```bash
|
||||
# auf RedHat-basierten Distributionen
|
||||
dnf config-manager --add-repo https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/rpm/stable.repo
|
||||
|
||||
# Fedora 41+ (DNF5)
|
||||
dnf config-manager addrepo --from-repofile=https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/rpm/stable.repo
|
||||
|
||||
# auf SUSE-basierten Distributionen
|
||||
zypper addrepo https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/rpm/stable.repo
|
||||
```
|
||||
|
||||
Paket installieren:
|
||||
|
||||
```bash
|
||||
# auf RedHat-basierten Distributionen
|
||||
dnf install docker-update
|
||||
|
||||
# auf SUSE-basierten Distributionen
|
||||
zypper install docker-update
|
||||
```
|
||||
|
||||
#### Testing (Vorschau / Testing)
|
||||
|
||||
Repository einrichten:
|
||||
```bash
|
||||
# auf RedHat-basierten Distributionen
|
||||
dnf config-manager --add-repo https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/rpm/testing.repo
|
||||
|
||||
# Fedora 41+ (DNF5)
|
||||
dnf config-manager addrepo --from-repofile=https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/rpm/testing.repo
|
||||
|
||||
# auf SUSE-basierten Distributionen
|
||||
zypper addrepo https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/rpm/testing.repo
|
||||
```
|
||||
|
||||
Paket installieren:
|
||||
|
||||
```bash
|
||||
# auf RedHat-basierten Distributionen
|
||||
dnf install docker-update
|
||||
|
||||
# auf SUSE-basierten Distributionen
|
||||
zypper install docker-update
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### 3. Arch Linux (`pacman`)
|
||||
|
||||
### Installiere den GPG-Key für das Repository
|
||||
|
||||
Key herunterladen:
|
||||
|
||||
```bash
|
||||
wget https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/repository.key
|
||||
```
|
||||
|
||||
ID des Keys anzeigen lassen:
|
||||
|
||||
```bash
|
||||
gpg --show-keys repository.key
|
||||
```
|
||||
|
||||
Key zu pacman hinzufügen und signieren:
|
||||
|
||||
```
|
||||
pacman-key --add repository.key
|
||||
pacman-key --lsign-key {key id}
|
||||
```
|
||||
|
||||
{key id} = ID aus dem vorherigen Schritt
|
||||
|
||||
#### Stable (Produktiv)
|
||||
|
||||
Füge das Repository in `/etc/pacman.conf` ein:
|
||||
```ini
|
||||
[stable]
|
||||
SigLevel = Optional TrustAll
|
||||
Server = https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/stable/x86_64
|
||||
```
|
||||
|
||||
Installiere das Paket anschließend:
|
||||
|
||||
```bash
|
||||
sudo pacman -Sy docker-update
|
||||
```
|
||||
|
||||
#### Testing (Vorschau / Testing)
|
||||
|
||||
Füge das Testing-Repository in `/etc/pacman.conf` ein:
|
||||
|
||||
```ini
|
||||
[testing]
|
||||
SigLevel = Optional TrustAll
|
||||
Server = https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/testing/x86_64
|
||||
```
|
||||
|
||||
Installiere das Paket:
|
||||
|
||||
```bash
|
||||
sudo pacman -Sy docker-update
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Download vorgefertigter Pakete (Releases)
|
||||
|
||||
Alternativ können vorkompilierte Pakete (`.deb`, `.rpm`, `.pkg.tar.zst`) auch direkt aus den Releases heruntergeladen
|
||||
und manuell installiert werden:
|
||||
|
||||
- **Stable-Releases**: [Gitea Releases](https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate/releases)
|
||||
- **Preview-Releases (Testing)**: Markiert als Vorabveröffentlichung (*Pre-release*) mit dem Tag `v<VERSION>-preview`.
|
||||
|
||||
---
|
||||
|
||||
## Manuelle Installation (Build from Source)
|
||||
|
||||
```bash
|
||||
@@ -98,7 +256,7 @@ cargo install cargo-deb
|
||||
cargo deb
|
||||
|
||||
# Installation des erstellten Pakets
|
||||
sudo dpkg -i target/debian/docker-update_0.1.0-1_amd64.deb
|
||||
sudo dpkg -i target/debian/docker-update_*.deb
|
||||
```
|
||||
|
||||
Die Paketkonfiguration und Abhängigkeiten (`sudo`, `docker.io | docker-ce`) sind in `Cargo.toml` unter
|
||||
@@ -106,29 +264,33 @@ Die Paketkonfiguration und Abhängigkeiten (`sudo`, `docker.io | docker-ce`) sin
|
||||
|
||||
---
|
||||
|
||||
### 2. Arch Linux (`PKGBUILD`)
|
||||
### 2. Arch Linux (`.pkg.tar.zst`)
|
||||
|
||||
Für Arch Linux liegt ein `PKGBUILD` im Verzeichnis `packaging/arch/` bereit:
|
||||
Die Paketmetadaten und Abhängigkeiten für Arch Linux sind direkt in `Cargo.toml` unter `[package.metadata.arch]`
|
||||
hinterlegt. Das Paket kann nach dem Kompilieren des Release-Builds über das Skript `scripts/package-arch.py` (analog zu
|
||||
CI/CD) erzeugt
|
||||
werden:
|
||||
|
||||
```bash
|
||||
cd packaging/arch
|
||||
# Release kompilieren
|
||||
cargo build --release
|
||||
|
||||
# Paket bauen und installieren
|
||||
makepkg -si
|
||||
# Arch Linux-Paket (.pkg.tar.zst) erstellen
|
||||
python3 scripts/package-arch.py
|
||||
|
||||
# Installation des erstellten Pakets
|
||||
sudo pacman -U target/arch/docker-update-*.pkg.tar.zst
|
||||
```
|
||||
|
||||
Alternativ kann das Binary auch manuell mit `pacman -U <paketdatei>.pkg.tar.zst` installiert werden.
|
||||
|
||||
---
|
||||
|
||||
### 3. Fedora / RHEL / CentOS (`.rpm`)
|
||||
|
||||
Für RPM-basierte Distributionen gibt es zwei Möglichkeiten:
|
||||
|
||||
#### Option A: Mit `cargo-generate-rpm`
|
||||
Das RPM-Paket wird mithilfe von [`cargo-generate-rpm`](https://github.com/cat-in-136/cargo-generate-rpm) direkt aus den
|
||||
Metadaten in `Cargo.toml` (`[package.metadata.generate-rpm]`) erstellt:
|
||||
|
||||
```bash
|
||||
# cargo-generate-rpm installieren
|
||||
# cargo-generate-rpm installieren (falls noch nicht vorhanden)
|
||||
cargo install cargo-generate-rpm
|
||||
|
||||
# Release bauen und RPM erzeugen
|
||||
@@ -136,19 +298,7 @@ cargo build --release
|
||||
cargo generate-rpm
|
||||
|
||||
# Installation des erstellten RPM-Pakets
|
||||
sudo dnf install target/generate-rpm/docker-update-0.1.0-1.*.rpm
|
||||
```
|
||||
|
||||
#### Option B: Mit `rpmbuild` und Spec-Datei
|
||||
|
||||
Die RPM-Spec-Datei befindet sich in `packaging/fedora/docker-update.spec`:
|
||||
|
||||
```bash
|
||||
# Erforderliche Build-Werkzeuge installieren
|
||||
sudo dnf install rpm-build
|
||||
|
||||
# Paket über rpmbuild erstellen
|
||||
rpmbuild -ba packaging/fedora/docker-update.spec
|
||||
sudo dnf install target/generate-rpm/docker-update-*.rpm
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
# Maintainer: DragonSlayer_14
|
||||
|
||||
pkgname=docker-update
|
||||
pkgver=0.1.0
|
||||
pkgrel=1
|
||||
pkgdesc="Automatisches Aktualisieren von Docker-Compose-Anwendungen in /var/apps mit :latest-Images"
|
||||
arch=('x86_64' 'aarch64')
|
||||
url="https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate"
|
||||
license=('GPL-3.0-or-later')
|
||||
depends=('gcc-libs' 'glibc' 'sudo' 'docker')
|
||||
optdepends=('docker-compose: Unterstützung für Docker Compose v1')
|
||||
makedepends=('cargo')
|
||||
source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
|
||||
sha256sums=('SKIP')
|
||||
|
||||
prepare() {
|
||||
cd "$srcdir/$pkgname-$pkgver" 2>/dev/null || cd "$srcdir/$pkgname" 2>/dev/null || cd "$srcdir"
|
||||
export RUSTUP_TOOLCHAIN=stable
|
||||
cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')" 2>/dev/null || cargo fetch || true
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "$srcdir/$pkgname-$pkgver" 2>/dev/null || cd "$srcdir/$pkgname" 2>/dev/null || cd "$srcdir"
|
||||
export RUSTUP_TOOLCHAIN=stable
|
||||
export CARGO_TARGET_DIR=target
|
||||
cargo build --frozen --release --all-targets 2>/dev/null || cargo build --release
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "$srcdir/$pkgname-$pkgver" 2>/dev/null || cd "$srcdir/$pkgname" 2>/dev/null || cd "$srcdir"
|
||||
export RUSTUP_TOOLCHAIN=stable
|
||||
cargo test --frozen 2>/dev/null || cargo test
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "$srcdir/$pkgname-$pkgver" 2>/dev/null || cd "$srcdir/$pkgname" 2>/dev/null || cd "$srcdir"
|
||||
install -Dm755 "target/release/$pkgname" "$pkgdir/usr/bin/$pkgname"
|
||||
install -Dm644 "LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
|
||||
install -Dm644 "README.md" "$pkgdir/usr/share/doc/$pkgname/README.md"
|
||||
}
|
||||
@@ -1,42 +0,0 @@
|
||||
Name: docker-update
|
||||
Version: 0.1.0
|
||||
Release: 1%{?dist}
|
||||
Summary: Automatisches Aktualisieren von Docker-Compose-Anwendungen in /var/apps mit :latest-Images
|
||||
|
||||
License: GPL-3.0-or-later
|
||||
URL: https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: cargo
|
||||
BuildRequires: rust
|
||||
Requires: sudo
|
||||
Requires: (docker or moby-engine or docker-ce)
|
||||
Suggests: (docker-compose or docker-compose-plugin)
|
||||
|
||||
%description
|
||||
DockerUpdate durchsucht Verzeichnisse (standardmäßig in /var/apps) nach
|
||||
Docker-Compose-Dateien mit ':latest'-Images, prüft auf neuere Images,
|
||||
lädt diese herunter und startet die betroffenen Container automatisch neu.
|
||||
|
||||
%prep
|
||||
%autosetup
|
||||
|
||||
%build
|
||||
cargo build --release
|
||||
|
||||
%check
|
||||
cargo test
|
||||
|
||||
%install
|
||||
install -D -p -m 0755 target/release/%{name} %{buildroot}%{_bindir}/%{name}
|
||||
install -D -p -m 0644 README.md %{buildroot}%{_docdir}/%{name}/README.md
|
||||
install -D -p -m 0644 LICENSE %{buildroot}%{_licensedir}/%{name}/LICENSE
|
||||
|
||||
%files
|
||||
%license LICENSE
|
||||
%doc README.md
|
||||
%{_bindir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Sun Aug 23 2026 DragonSlayer_14 <dragonslayer@creative-dragonslayer.de> - 0.1.0-1
|
||||
- Erstveröffentlichung von docker-update
|
||||
Executable
+71
@@ -0,0 +1,71 @@
|
||||
#!/usr/bin/env python3
|
||||
import json
|
||||
import os
|
||||
import subprocess
|
||||
import tempfile
|
||||
import time
|
||||
|
||||
|
||||
def main():
|
||||
metadata = json.loads(subprocess.check_output(["cargo", "metadata", "--format-version", "1", "--no-deps"]))
|
||||
pkg = metadata["packages"][0]
|
||||
name = pkg["name"]
|
||||
version = pkg["version"]
|
||||
description = pkg.get("description", "")
|
||||
license_name = pkg.get("license", "")
|
||||
repository = pkg.get("repository", "")
|
||||
authors = pkg.get("authors", [])
|
||||
author = authors[0] if authors else "Unknown"
|
||||
|
||||
arch_meta = pkg.get("metadata", {}).get("arch", {})
|
||||
pkgrel = arch_meta.get("pkgrel", "1")
|
||||
arch = arch_meta.get("arch", "x86_64")
|
||||
depends = arch_meta.get("depends", ["gcc-libs", "glibc", "sudo", "docker-ce-cli", "docker-compose-plugin"])
|
||||
optdepends = arch_meta.get("optdepends", ["docker-compose: Unterstützung für Docker Compose v1"])
|
||||
|
||||
with tempfile.TemporaryDirectory() as build_dir:
|
||||
bin_dir = os.path.join(build_dir, "usr/bin")
|
||||
doc_dir = os.path.join(build_dir, f"usr/share/doc/{name}")
|
||||
lic_dir = os.path.join(build_dir, f"usr/share/licenses/{name}")
|
||||
os.makedirs(bin_dir, exist_ok=True)
|
||||
os.makedirs(doc_dir, exist_ok=True)
|
||||
os.makedirs(lic_dir, exist_ok=True)
|
||||
|
||||
subprocess.run(["install", "-m", "755", f"target/release/{name}", f"{bin_dir}/{name}"], check=True)
|
||||
if os.path.exists("LICENSE"):
|
||||
subprocess.run(["install", "-m", "644", "LICENSE", f"{lic_dir}/LICENSE"], check=True)
|
||||
if os.path.exists("README.md"):
|
||||
subprocess.run(["install", "-m", "644", "README.md", f"{doc_dir}/README.md"], check=True)
|
||||
|
||||
installed_size = subprocess.check_output(["du", "-sb", build_dir]).decode().split()[0]
|
||||
builddate = str(int(time.time()))
|
||||
|
||||
pkginfo_lines = [
|
||||
f"pkgname = {name}",
|
||||
f"pkgbase = {name}",
|
||||
f"pkgver = {version}-{pkgrel}",
|
||||
f"pkgdesc = {description}",
|
||||
f"url = {repository}",
|
||||
f"builddate = {builddate}",
|
||||
f"packager = {author}",
|
||||
f"size = {installed_size}",
|
||||
f"arch = {arch}",
|
||||
f"license = {license_name}",
|
||||
]
|
||||
for dep in depends:
|
||||
pkginfo_lines.append(f"depend = {dep}")
|
||||
for optdep in optdepends:
|
||||
pkginfo_lines.append(f"optdepend = {optdep}")
|
||||
pkginfo_lines.append("makepkgopt = strip\n")
|
||||
|
||||
with open(os.path.join(build_dir, ".PKGINFO"), "w") as f:
|
||||
f.write("\n".join(pkginfo_lines))
|
||||
|
||||
os.makedirs("target/arch", exist_ok=True)
|
||||
output_file = os.path.abspath(f"target/arch/{name}-{version}-{pkgrel}-{arch}.pkg.tar.zst")
|
||||
subprocess.run(["tar", "--zstd", "-cf", output_file, ".PKGINFO", "usr"], cwd=build_dir, check=True)
|
||||
print(f"Arch-Paket erfolgreich erstellt: {output_file}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
+11
-29
@@ -1,10 +1,10 @@
|
||||
//! Einfaches, threadsicheres Logging-Modul.
|
||||
//!
|
||||
//! Merkmale:
|
||||
//! - Ausgabe in Terminal (stdout/stderr) und zusätzlich in eine Logdatei im temporären Verzeichnis.
|
||||
//! - Ausgabe auf Standard-Streams (stdout/stderr) und zusätzlich in eine Logdatei im temporären Verzeichnis.
|
||||
//! - Nachrichtenvorlage: `[DD.MM.YYYY HH:MM:SS.mmm][LEVEL][TAG]: <Text>` mit Präfix ([!]/[?]/[i]/[d]).
|
||||
//! - Der aktuell verwendete Schweregradfilter ist statisch (`LOG_LEVEL`) und wird zur Laufzeit nicht geändert.
|
||||
//! - Terminal-Erkennung und Dateihandle werden lazily initialisiert und zwischengespeichert (`OnceLock`).
|
||||
//! - Dateihandle wird lazily initialisiert und zwischengespeichert (`OnceLock`).
|
||||
//!
|
||||
//! Hinweise:
|
||||
//! - Bei einem leeren `tag` wird ein leerer Tag-Abschnitt erzeugt.
|
||||
@@ -22,13 +22,13 @@
|
||||
|
||||
use std::env;
|
||||
use std::fmt::{Display, Formatter};
|
||||
use std::fs::{create_dir_all, File, OpenOptions};
|
||||
use std::io::{stdout, IsTerminal, Write};
|
||||
use std::fs::{File, OpenOptions, create_dir_all};
|
||||
use std::io::Write;
|
||||
use std::sync::{Mutex, OnceLock};
|
||||
|
||||
use crate::config;
|
||||
use crate::program;
|
||||
use time::{macros::format_description, OffsetDateTime};
|
||||
use time::{OffsetDateTime, macros::format_description};
|
||||
|
||||
/// Schweregrade für Logeinträge in aufsteigender Detailtiefe.
|
||||
///
|
||||
@@ -71,14 +71,11 @@ impl TryFrom<String> for LogLevel {
|
||||
"warn" => Ok(LogLevel::Warn),
|
||||
"info" => Ok(LogLevel::Info),
|
||||
"debug" => Ok(LogLevel::Debug),
|
||||
_ => Err(LogLevel::Info)
|
||||
_ => Err(LogLevel::Info),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Zwischenspeicher für die einmalig ermittelte Terminal-Fähigkeit von `stdout`.
|
||||
static IS_TERMINAL: OnceLock<bool> = OnceLock::new();
|
||||
|
||||
/// Globaler Schweregradfilter für Ausgabe.
|
||||
static LOG_LEVEL: OnceLock<LogLevel> = OnceLock::new();
|
||||
|
||||
@@ -89,7 +86,7 @@ static LOG_FILE: OnceLock<Mutex<Option<File>>> = OnceLock::new();
|
||||
///
|
||||
/// Verhalten:
|
||||
/// - Wenn `log_level` größer als der globale Filter ist, wird nichts ausgegeben.
|
||||
/// - Bei Terminalausgabe gehen `Error`-Meldungen nach `stderr`, alle anderen nach `stdout`.
|
||||
/// - `Error`-Meldungen gehen nach `stderr`, alle anderen nach `stdout`.
|
||||
/// - Zusätzlich wird in eine tägliche Logdatei im Temp-Verzeichnis geschrieben (wenn erfolgreich geöffnet).
|
||||
///
|
||||
/// Parameter:
|
||||
@@ -109,12 +106,10 @@ pub fn log(tag: &str, message: &str, log_level: LogLevel) {
|
||||
if log_level <= get_log_level() {
|
||||
let message: String = format_message(tag, message, &log_level);
|
||||
|
||||
if is_terminal() {
|
||||
if log_level == LogLevel::Error {
|
||||
eprintln!("{}", message)
|
||||
eprintln!("{}", message);
|
||||
} else {
|
||||
println!("{}", message)
|
||||
}
|
||||
println!("{}", message);
|
||||
}
|
||||
|
||||
let file_lock = get_or_init_log_file();
|
||||
@@ -138,17 +133,7 @@ fn get_log_level() -> LogLevel {
|
||||
*LOG_LEVEL.get_or_init(|| {
|
||||
let log_level = &config::get_config().general.log_level;
|
||||
LogLevel::try_from(log_level.to_string()).unwrap_or(LogLevel::Info)
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
/// Ermittelt einmalig, ob `stdout` ein Terminal ist, und cached das Ergebnis.
|
||||
///
|
||||
/// Rückgabe:
|
||||
/// - `true`, wenn `stdout` ein TTY/Terminal ist.
|
||||
/// - `false` andernfalls.
|
||||
fn is_terminal() -> bool {
|
||||
*IS_TERMINAL.get_or_init(|| stdout().is_terminal())
|
||||
})
|
||||
}
|
||||
|
||||
/// Formatiert eine Lognachricht mit Zeitstempel, Level, Tag und Präfix.
|
||||
@@ -234,10 +219,7 @@ fn open_log_file() -> std::io::Result<File> {
|
||||
let file_name = format!("log-{}.log", date_str);
|
||||
dir.push(file_name);
|
||||
|
||||
OpenOptions::new()
|
||||
.create(true)
|
||||
.append(true)
|
||||
.open(dir)
|
||||
OpenOptions::new().create(true).append(true).open(dir)
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
+10
-2
@@ -1,6 +1,7 @@
|
||||
use crate::log::{LogLevel, log};
|
||||
use std::env;
|
||||
use std::os::unix::process::CommandExt;
|
||||
use std::process::Command;
|
||||
use std::process::{Command, exit};
|
||||
|
||||
/// Prüft, ob das Programm mit Root-/Administrator-Rechten ausgeführt wird.
|
||||
///
|
||||
@@ -11,10 +12,17 @@ use std::process::Command;
|
||||
pub fn is_run_as_root() -> bool {
|
||||
unsafe { libc::geteuid() == 0 }
|
||||
}
|
||||
|
||||
/// Startet das Programm mit Root-Rechten über `sudo` neu.
|
||||
///
|
||||
/// Diese Funktion versucht das Programm mit erhöhten Rechten neu zu starten.
|
||||
pub fn run_as_root() {
|
||||
let commandline_args: Vec<String> = env::args().collect();
|
||||
let _output = Command::new("sudo").args(&commandline_args).exec(); // Bye bye never returns
|
||||
let err = Command::new("sudo").args(&commandline_args).exec();
|
||||
log(
|
||||
"auth",
|
||||
&format!("Fehler beim Ausführen von 'sudo': {}", err),
|
||||
LogLevel::Error,
|
||||
);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
+189
-30
@@ -1,10 +1,10 @@
|
||||
use crate::config;
|
||||
use crate::log::{LogLevel, log};
|
||||
use serde::Deserialize;
|
||||
use std::collections::HashMap;
|
||||
use std::fs;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::process::{Command, Output};
|
||||
use serde::Deserialize;
|
||||
use std::collections::HashMap;
|
||||
use crate::log::{log, LogLevel};
|
||||
use crate::config;
|
||||
|
||||
const COMPOSE_FILENAMES: &[&str] = &[
|
||||
"docker-compose.yaml",
|
||||
@@ -58,11 +58,21 @@ pub fn find_compose_file(dir: &Path) -> Option<PathBuf> {
|
||||
|
||||
/// Liest eine Compose-Datei ein und liefert eine Liste von (Service-Name, Image-Name).
|
||||
pub fn parse_compose_services(compose_path: &Path) -> Result<Vec<(String, String)>, String> {
|
||||
let content = fs::read_to_string(compose_path)
|
||||
.map_err(|e| format!("Fehler beim Lesen der Datei '{}': {}", compose_path.display(), e))?;
|
||||
let content = fs::read_to_string(compose_path).map_err(|e| {
|
||||
format!(
|
||||
"Fehler beim Lesen der Datei '{}': {}",
|
||||
compose_path.display(),
|
||||
e
|
||||
)
|
||||
})?;
|
||||
|
||||
let compose: ComposeFile = serde_yaml::from_str(&content)
|
||||
.map_err(|e| format!("Fehler beim Parsen der YAML-Datei '{}': {}", compose_path.display(), e))?;
|
||||
let compose: ComposeFile = serde_yaml::from_str(&content).map_err(|e| {
|
||||
format!(
|
||||
"Fehler beim Parsen der YAML-Datei '{}': {}",
|
||||
compose_path.display(),
|
||||
e
|
||||
)
|
||||
})?;
|
||||
|
||||
let mut services = Vec::new();
|
||||
for (service_name, config) in compose.services {
|
||||
@@ -83,7 +93,7 @@ fn run_docker_command(args: &[&str]) -> std::io::Result<Output> {
|
||||
}
|
||||
|
||||
/// Führt einen Docker-Compose-Befehl im angegebenen Verzeichnis aus.
|
||||
/// Versucht zuerst `docker compose` und fällt bei Bedarf auf `docker-compose` zurück.
|
||||
/// Versucht zuerst `docker compose` und fällt bei Nichtverfügbarkeit auf `docker-compose` zurück.
|
||||
pub fn run_compose_command(dir: &Path, args: &[&str]) -> std::io::Result<Output> {
|
||||
let mut compose_args = vec!["compose"];
|
||||
compose_args.extend_from_slice(args);
|
||||
@@ -94,14 +104,32 @@ pub fn run_compose_command(dir: &Path, args: &[&str]) -> std::io::Result<Output>
|
||||
.output();
|
||||
|
||||
match output {
|
||||
Ok(out) if out.status.success() || out.status.code() != Some(127) => Ok(out),
|
||||
_ => {
|
||||
// Fallback auf docker-compose (v1)
|
||||
Ok(out) => {
|
||||
let stderr = String::from_utf8_lossy(&out.stderr);
|
||||
let is_unavailable = !out.status.success()
|
||||
&& (stderr.contains("is not a docker command")
|
||||
|| stderr.contains("unknown command \"compose\"")
|
||||
|| stderr.contains("unknown command: compose"));
|
||||
|
||||
if is_unavailable {
|
||||
if let Ok(fallback_out) = Command::new("docker-compose")
|
||||
.current_dir(dir)
|
||||
.args(args)
|
||||
.output()
|
||||
{
|
||||
return Ok(fallback_out);
|
||||
}
|
||||
}
|
||||
Ok(out)
|
||||
}
|
||||
Err(err) if err.kind() == std::io::ErrorKind::NotFound => {
|
||||
// docker-Binary nicht gefunden, versuche docker-compose
|
||||
Command::new("docker-compose")
|
||||
.current_dir(dir)
|
||||
.args(args)
|
||||
.output()
|
||||
}
|
||||
Err(err) => Err(err),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -126,7 +154,10 @@ pub fn pull_image(image: &str) -> Result<bool, String> {
|
||||
|
||||
if !output.status.success() {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||
return Err(format!("'docker pull {}' fehlgeschlagen: {}", image, stderr));
|
||||
return Err(format!(
|
||||
"'docker pull {}' fehlgeschlagen: {}",
|
||||
image, stderr
|
||||
));
|
||||
}
|
||||
|
||||
let stdout_str = String::from_utf8_lossy(&output.stdout);
|
||||
@@ -159,22 +190,53 @@ pub fn restart_compose_service(dir: &Path, service_name: Option<&str>) -> Result
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Bereinigt ungenutzte Zwischen-Images via `docker image prune -f`.
|
||||
pub fn prune_images() -> Result<(), String> {
|
||||
let output = run_docker_command(&["image", "prune", "-f"])
|
||||
.map_err(|e| format!("Fehler beim Ausführen von 'docker image prune -f': {}", e))?;
|
||||
|
||||
if !output.status.success() {
|
||||
let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
|
||||
return Err(format!(
|
||||
"'docker image prune -f' fehlgeschlagen: {}",
|
||||
stderr
|
||||
));
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Prüft alle Unterverzeichnisse im konfigurierten Apps-Verzeichnis auf Aktualisierungen.
|
||||
pub fn run_updates() {
|
||||
let config = config::get_config();
|
||||
let apps_dir_path = Path::new(&config.general.apps_dir);
|
||||
|
||||
log("scanner", &format!("Überprüfe Anwendungsverzeichnis: {}", apps_dir_path.display()), LogLevel::Info);
|
||||
log(
|
||||
"scanner",
|
||||
&format!(
|
||||
"Überprüfe Anwendungsverzeichnis: {}",
|
||||
apps_dir_path.display()
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
|
||||
if !apps_dir_path.exists() {
|
||||
log("scanner", &format!("Verzeichnis '{}' existiert nicht.", apps_dir_path.display()), LogLevel::Warn);
|
||||
log(
|
||||
"scanner",
|
||||
&format!("Verzeichnis '{}' existiert nicht.", apps_dir_path.display()),
|
||||
LogLevel::Warn,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
let entries = match fs::read_dir(apps_dir_path) {
|
||||
Ok(e) => e,
|
||||
Err(e) => {
|
||||
log("scanner", &format!("Fehler beim Lesen von '{}': {}", apps_dir_path.display(), e), LogLevel::Error);
|
||||
log(
|
||||
"scanner",
|
||||
&format!("Fehler beim Lesen von '{}': {}", apps_dir_path.display(), e),
|
||||
LogLevel::Error,
|
||||
);
|
||||
return;
|
||||
}
|
||||
};
|
||||
@@ -187,28 +249,58 @@ pub fn run_updates() {
|
||||
app_dirs.sort();
|
||||
|
||||
if app_dirs.is_empty() {
|
||||
log("scanner", &format!("Keine Unterverzeichnisse in '{}' gefunden.", apps_dir_path.display()), LogLevel::Info);
|
||||
log(
|
||||
"scanner",
|
||||
&format!(
|
||||
"Keine Unterverzeichnisse in '{}' gefunden.",
|
||||
apps_dir_path.display()
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
for app_dir in app_dirs {
|
||||
let app_name = app_dir.file_name().unwrap_or_default().to_string_lossy();
|
||||
log("scanner", &format!("Untersuche Anwendung '{}'...", app_name), LogLevel::Info);
|
||||
log(
|
||||
"scanner",
|
||||
&format!("Untersuche Anwendung '{}'...", app_name),
|
||||
LogLevel::Info,
|
||||
);
|
||||
|
||||
let compose_file = match find_compose_file(&app_dir) {
|
||||
Some(f) => f,
|
||||
None => {
|
||||
log("scanner", &format!("Keine Docker-Compose-Datei in '{}' gefunden. Überspringe.", app_dir.display()), LogLevel::Debug);
|
||||
log(
|
||||
"scanner",
|
||||
&format!(
|
||||
"Keine Docker-Compose-Datei in '{}' gefunden. Überspringe.",
|
||||
app_dir.display()
|
||||
),
|
||||
LogLevel::Debug,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
};
|
||||
|
||||
log("compose", &format!("Gefundene Compose-Datei: {}", compose_file.display()), LogLevel::Debug);
|
||||
log(
|
||||
"compose",
|
||||
&format!("Gefundene Compose-Datei: {}", compose_file.display()),
|
||||
LogLevel::Debug,
|
||||
);
|
||||
|
||||
let services = match parse_compose_services(&compose_file) {
|
||||
Ok(s) => s,
|
||||
Err(e) => {
|
||||
log("compose", &format!("Fehler beim Analysieren von '{}': {}", compose_file.display(), e), LogLevel::Warn);
|
||||
log(
|
||||
"compose",
|
||||
&format!(
|
||||
"Fehler beim Analysieren von '{}': {}",
|
||||
compose_file.display(),
|
||||
e
|
||||
),
|
||||
LogLevel::Warn,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
};
|
||||
@@ -217,40 +309,107 @@ pub fn run_updates() {
|
||||
|
||||
for (service_name, image) in services {
|
||||
if !is_latest_image(&image) {
|
||||
log("updater", &format!("Service '{}' verwendet kein :latest-Image ('{}'). Überspringe.", service_name, image), LogLevel::Debug);
|
||||
log(
|
||||
"updater",
|
||||
&format!(
|
||||
"Service '{}' verwendet kein :latest-Image ('{}'). Überspringe.",
|
||||
service_name, image
|
||||
),
|
||||
LogLevel::Debug,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
|
||||
log("updater", &format!("Prüfe auf neues Image für Service '{}' ('{}')...", service_name, image), LogLevel::Info);
|
||||
log(
|
||||
"updater",
|
||||
&format!(
|
||||
"Prüfe auf neues Image für Service '{}' ('{}')...",
|
||||
service_name, image
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
|
||||
match pull_image(&image) {
|
||||
Ok(true) => {
|
||||
log("updater", &format!("Neueres Image für Service '{}' ('{}') gefunden und heruntergeladen.", service_name, image), LogLevel::Info);
|
||||
log(
|
||||
"updater",
|
||||
&format!(
|
||||
"Neueres Image für Service '{}' ('{}') gefunden und heruntergeladen.",
|
||||
service_name, image
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
updated_any = true;
|
||||
}
|
||||
Ok(false) => {
|
||||
log("updater", &format!("Image für Service '{}' ('{}') ist bereits aktuell.", service_name, image), LogLevel::Info);
|
||||
log(
|
||||
"updater",
|
||||
&format!(
|
||||
"Image für Service '{}' ('{}') ist bereits aktuell.",
|
||||
service_name, image
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
log("updater", &format!("Fehler beim Aktualisieren von Image '{}': {}", image, e), LogLevel::Error);
|
||||
log(
|
||||
"updater",
|
||||
&format!("Fehler beim Aktualisieren von Image '{}': {}", image, e),
|
||||
LogLevel::Error,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if updated_any {
|
||||
log("updater", &format!("Starte Anwendung '{}' neu mit aktualisierten Images...", app_name), LogLevel::Info);
|
||||
log(
|
||||
"updater",
|
||||
&format!(
|
||||
"Starte Anwendung '{}' neu mit aktualisierten Images...",
|
||||
app_name
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
match restart_compose_service(&app_dir, None) {
|
||||
Ok(_) => {
|
||||
log("updater", &format!("Anwendung '{}' erfolgreich aktualisiert und neu gestartet.", app_name), LogLevel::Info);
|
||||
log(
|
||||
"updater",
|
||||
&format!(
|
||||
"Anwendung '{}' erfolgreich aktualisiert und neu gestartet.",
|
||||
app_name
|
||||
),
|
||||
LogLevel::Info,
|
||||
);
|
||||
}
|
||||
Err(e) => {
|
||||
log("updater", &format!("Fehler beim Neustarten der Anwendung '{}': {}", app_name, e), LogLevel::Error);
|
||||
log(
|
||||
"updater",
|
||||
&format!("Fehler beim Neustarten der Anwendung '{}': {}", app_name, e),
|
||||
LogLevel::Error,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
log(
|
||||
"updater",
|
||||
"Bereinige ungenutzte Docker-Images...",
|
||||
LogLevel::Info,
|
||||
);
|
||||
if let Err(e) = prune_images() {
|
||||
log(
|
||||
"updater",
|
||||
&format!("Fehler beim Bereinigen ungenutzter Docker-Images: {}", e),
|
||||
LogLevel::Warn,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
log("scanner", "Aktualisierungsvorgang abgeschlossen.", LogLevel::Info);
|
||||
log(
|
||||
"scanner",
|
||||
"Aktualisierungsvorgang abgeschlossen.",
|
||||
LogLevel::Info,
|
||||
);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
|
||||
Reference in New Issue
Block a user