Compare commits

...
Author SHA1 Message Date
DragonSlayer_14 d974f1b7ac Merge pull request 'Merge dev in testing: Ändert serde_yaml auf serde-saphyr' (#19) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Successful in 2m33s
Reviewed-on: #19
2026-08-24 19:42:07 +00:00
DragonSlayer_14 9858ee959d Merge branch 'testing' into dev 2026-08-24 19:41:59 +00:00
DragonSlayer_14 d726bab972 Feat: Dependency-Updates mit Versionierung und Deprecation von serde_yaml 2026-08-24 21:41:13 +02:00
DragonSlayer_14 851cfaeda8 Merge remote-tracking branch 'origin/dev' into dev 2026-08-24 21:40:33 +02:00
DragonSlayer_14 9c4a1e1c95 Feat: Dependency auf serde-saphyr aktualisiert und Version auf 1.1.0 erhöht 2026-08-24 21:40:28 +02:00
DragonSlayer_14 fc798b39a3 Feat: Dependency-Updates mit Versionierung und Deprecation von serde_yaml
Aktualisierung von time, serde und libc sowie Hinweis zur Deprecation von serde_yaml
2026-08-24 21:31:37 +02:00
DragonSlayer_14 2bde2baf66 Merge pull request 'Merge dev in testing: Feat: Einführung eines Skripts zur dynamischen Bestimmung der Build-Nummer und Integration in die Build-Prozesse' (#18) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Successful in 1m52s
Reviewed-on: #18
2026-08-24 19:21:13 +00:00
DragonSlayer_14 24f127c629 Merge branch 'testing' into dev 2026-08-24 19:21:04 +00:00
DragonSlayer_14 b4bf33ebd9 Merge remote-tracking branch 'origin/dev' into dev 2026-08-24 21:19:22 +02:00
DragonSlayer_14 83ae3ad3cc Feat: Einführung eines Skripts zur dynamischen Bestimmung der Build-Nummer und Integration in die Build-Prozesse 2026-08-24 21:19:14 +02:00
DragonSlayer_14 18854200c0 Merge branch 'main' into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Failing after 1m50s
2026-08-24 19:04:37 +00:00
DragonSlayer_14 7e644e52c6 Merge pull request 'Merge dev in testing: Behebt Fehler bei RPM-Paketgenerierung' (#16) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Successful in 1m57s
Reviewed-on: #16
2026-08-24 19:01:07 +00:00
DragonSlayer_14 fd0ddf6aeb Merge branch 'testing' into dev 2026-08-24 19:00:58 +00:00
DragonSlayer_14 c0ad5987df Merge remote-tracking branch 'origin/dev' into dev 2026-08-24 21:00:13 +02:00
DragonSlayer_14 52d9bb6880 Feat: Version auf 1.0.2 aktualisiert und Cross-Compilation-Anleitung hinzugefügt 2026-08-24 21:00:08 +02:00
DragonSlayer_14 d8ce9849b8 Merge pull request 'Merge dev into testing: Fügt Unterstützung für die Architekturen arm64 und i368 hinzu' (#15) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Successful in 1m51s
Reviewed-on: #15
2026-08-24 18:53:03 +00:00
DragonSlayer_14 f04663803c Merge branch 'testing' into dev 2026-08-24 18:53:00 +00:00
DragonSlayer_14 a1fac95722 Feat: Hebt Version auf 1.0.1 an 2026-08-24 20:51:56 +02:00
DragonSlayer_14 020e2f3b1a Merge remote-tracking branch 'origin/dev' into dev 2026-08-24 20:51:11 +02:00
DragonSlayer_14 aa9e1da74f Feat: Unterstützung für Cross-Compilation und mehrere Architekturen hinzugefügt
Aktualisierung der Build-Prozesse für aarch64, i686 und arm64 mit flexibler Zielangabe im Skript
2026-08-24 20:51:06 +02:00
DragonSlayer_14 cc1643cb8b Merge pull request 'Merge testing in main: 1.0.0 Release' (#14) from testing into main
Main Release & Publish / Build, Publish Packages (Stable) & Create Release (push) Successful in 52s
Reviewed-on: #14
2026-08-24 18:03:33 +00:00
DragonSlayer_14 c2d21e93c8 Merge pull request 'Merge dev in testing: Testing-Version 1.0.0' (#13) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Successful in 55s
Reviewed-on: #13
2026-08-24 18:01:13 +00:00
DragonSlayer_14 c02644b48d Merge branch 'testing' into dev 2026-08-24 18:01:05 +00:00
DragonSlayer_14 a1d22ce71f Merge remote-tracking branch 'origin/dev' into dev 2026-08-24 19:59:39 +02:00
DragonSlayer_14 10dc412566 Feat: Hebt Version auf 1.0.0 an 2026-08-24 19:59:33 +02:00
DragonSlayer_14 68c1b07b23 Feat: Fügt Anweisung für Arch fürs hinzufügen des Repo-GPG-Keys hinzu 2026-08-24 19:59:06 +02:00
DragonSlayer_14 25e076ba18 Merge pull request 'Merge dev in testing: Feat: Hebt Version auf 0.1.3 an' (#12) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Successful in 1m2s
Reviewed-on: #12
2026-08-24 17:48:03 +00:00
DragonSlayer_14 a0ffe731bf Merge branch 'testing' into dev 2026-08-24 17:47:51 +00:00
DragonSlayer_14 9a2a1730dd Feat: Hebt Version auf 0.1.3 an 2026-08-24 19:47:16 +02:00
DragonSlayer_14 851c863b24 Merge pull request 'Merge dev in testing: Passt Arch-Url an und behebt Fehler, wodurch das Repo zu testing/upload wurde' (#11) from dev into testing
Testing Build, Publish & Preview Release / Build, Publish Packages (Testing) & Create Preview Release (push) Failing after 54s
Reviewed-on: #11
2026-08-24 17:45:33 +00:00
DragonSlayer_14 0d811cfb75 Fix: Entfernt /upload von Arch-Package-Upload-URL 2026-08-24 19:44:25 +02:00
DragonSlayer_14 bd374b95fc Fix: Arch-Repository-Namen in README.md aktualisiert 2026-08-24 19:37:18 +02:00
10 changed files with 485 additions and 66 deletions
+5
View File
@@ -0,0 +1,5 @@
[target.aarch64-unknown-linux-gnu]
linker = "aarch64-linux-gnu-gcc"
[target.i686-unknown-linux-gnu]
linker = "i686-linux-gnu-gcc"
+37 -9
View File
@@ -19,6 +19,12 @@ jobs:
toolchain: stable toolchain: stable
cache: false cache: false
- name: Install Cross-Compilation Toolchains & Dependencies
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu gcc-i686-linux-gnu
rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu i686-unknown-linux-gnu
- name: Install Packaging Tools (Prebuilt Binaries) - name: Install Packaging Tools (Prebuilt Binaries)
run: | run: |
mkdir -p ~/.cargo/bin mkdir -p ~/.cargo/bin
@@ -30,21 +36,43 @@ jobs:
run: | run: |
cargo test cargo test
- name: Build Release Binary - name: Build Release Binaries
run: | run: |
cargo build --release cargo build --release --target x86_64-unknown-linux-gnu
cargo build --release --target aarch64-unknown-linux-gnu
cargo build --release --target i686-unknown-linux-gnu
- name: Build Debian Package (.deb) - name: Determine Build Number
id: build_num
env:
GITEA_URL: ${{ gitea.server_url || github.server_url }}
REPO: ${{ gitea.repository || github.repository }}
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: | run: |
cargo deb BUILD_NUM=$(python3 scripts/get-build-number.py)
echo "build_number=${BUILD_NUM}" >> $GITHUB_OUTPUT
echo "BUILD_NUMBER=${BUILD_NUM}" >> $GITHUB_ENV
echo "Ermittelte Build-Nummer: ${BUILD_NUM}"
- name: Build Fedora / RPM Package (.rpm) - name: Build Debian Packages (.deb)
run: | run: |
cargo generate-rpm cargo deb --target x86_64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build
cargo deb --target aarch64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build
cargo deb --target i686-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build
- name: Build Arch Linux Package (.pkg.tar.zst) - name: Build Fedora / RPM Packages (.rpm)
run: | run: |
python3 scripts/package-arch.py mkdir -p target/generate-rpm
cargo generate-rpm --target x86_64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm
cargo generate-rpm --target aarch64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm
cargo generate-rpm --target i686-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm
- name: Build Arch Linux Packages (.pkg.tar.zst)
run: |
python3 scripts/package-arch.py --target x86_64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}"
python3 scripts/package-arch.py --target aarch64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}"
python3 scripts/package-arch.py --target i686-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}"
- name: Publish Packages to Gitea Package Registry - name: Publish Packages to Gitea Package Registry
env: env:
@@ -76,7 +104,7 @@ jobs:
curl -f -s -S -X PUT \ curl -f -s -S -X PUT \
-H "Authorization: token ${TOKEN}" \ -H "Authorization: token ${TOKEN}" \
--upload-file "$pkg" \ --upload-file "$pkg" \
"${GITEA_URL}/api/packages/${REPO_OWNER}/arch/stable/upload" "${GITEA_URL}/api/packages/${REPO_OWNER}/arch/stable"
done done
- name: Create Gitea Release and Upload Assets - name: Create Gitea Release and Upload Assets
+37 -9
View File
@@ -19,6 +19,12 @@ jobs:
toolchain: stable toolchain: stable
cache: false cache: false
- name: Install Cross-Compilation Toolchains & Dependencies
run: |
sudo apt-get update
sudo apt-get install -y gcc-aarch64-linux-gnu gcc-i686-linux-gnu
rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu i686-unknown-linux-gnu
- name: Install Packaging Tools (Prebuilt Binaries) - name: Install Packaging Tools (Prebuilt Binaries)
run: | run: |
mkdir -p ~/.cargo/bin mkdir -p ~/.cargo/bin
@@ -30,21 +36,43 @@ jobs:
run: | run: |
cargo test cargo test
- name: Build Release Binary - name: Build Release Binaries
run: | run: |
cargo build --release cargo build --release --target x86_64-unknown-linux-gnu
cargo build --release --target aarch64-unknown-linux-gnu
cargo build --release --target i686-unknown-linux-gnu
- name: Build Debian Package (.deb) - name: Determine Build Number
id: build_num
env:
GITEA_URL: ${{ gitea.server_url || github.server_url }}
REPO: ${{ gitea.repository || github.repository }}
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: | run: |
cargo deb BUILD_NUM=$(python3 scripts/get-build-number.py)
echo "build_number=${BUILD_NUM}" >> $GITHUB_OUTPUT
echo "BUILD_NUMBER=${BUILD_NUM}" >> $GITHUB_ENV
echo "Ermittelte Build-Nummer: ${BUILD_NUM}"
- name: Build Fedora / RPM Package (.rpm) - name: Build Debian Packages (.deb)
run: | run: |
cargo generate-rpm cargo deb --target x86_64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build
cargo deb --target aarch64-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build
cargo deb --target i686-unknown-linux-gnu --deb-revision "${BUILD_NUMBER}" --no-build
- name: Build Arch Linux Package (.pkg.tar.zst) - name: Build Fedora / RPM Packages (.rpm)
run: | run: |
python3 scripts/package-arch.py mkdir -p target/generate-rpm
cargo generate-rpm --target x86_64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm
cargo generate-rpm --target aarch64-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm
cargo generate-rpm --target i686-unknown-linux-gnu -s "release=\"${BUILD_NUMBER}\"" -o target/generate-rpm
- name: Build Arch Linux Packages (.pkg.tar.zst)
run: |
python3 scripts/package-arch.py --target x86_64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}"
python3 scripts/package-arch.py --target aarch64-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}"
python3 scripts/package-arch.py --target i686-unknown-linux-gnu --pkgrel "${BUILD_NUMBER}"
- name: Publish Packages to Gitea Package Registry - name: Publish Packages to Gitea Package Registry
env: env:
@@ -76,7 +104,7 @@ jobs:
curl -f -s -S -X PUT \ curl -f -s -S -X PUT \
-H "Authorization: token ${TOKEN}" \ -H "Authorization: token ${TOKEN}" \
--upload-file "$pkg" \ --upload-file "$pkg" \
"${GITEA_URL}/api/packages/${REPO_OWNER}/arch/testing/upload" "${GITEA_URL}/api/packages/${REPO_OWNER}/arch/testing"
done done
- name: Create Gitea Pre-Release and Upload Assets - name: Create Gitea Pre-Release and Upload Assets
+3 -2
View File
@@ -32,7 +32,8 @@ DockerUpdate/
│ ├── testing.yaml # CI/CD für testing-Branch (Tests, Testing-Packages & Preview-Release) │ ├── 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) │ └── main.yaml # CI/CD für main-Branch (Tests, Stable-Packages & Release)
├── scripts/ ├── scripts/
── package-arch.py # Hilfsskript zur Arch-Linux-Paketerstellung (.pkg.tar.zst) ── get-build-number.py # Ermittelt dynamisch die nächste Build-Nummer für Pakete
│ └── 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.toml # Rust-Manifest, Abhängigkeiten und Metadaten für deb / generate-rpm / arch
├── Cargo.lock ├── Cargo.lock
├── LICENSE # GPL-3.0 Lizenztext ├── LICENSE # GPL-3.0 Lizenztext
@@ -55,7 +56,7 @@ DockerUpdate/
- **`src/updater.rs`**: - **`src/updater.rs`**:
- Sucht in Unterverzeichnissen von `apps_dir` nach Compose-Dateien (`docker-compose.yaml`, `docker-compose.yml`, - Sucht in Unterverzeichnissen von `apps_dir` nach Compose-Dateien (`docker-compose.yaml`, `docker-compose.yml`,
`compose.yaml`, `compose.yml`). `compose.yaml`, `compose.yml`).
- Parst Services via `serde_yaml` und filtert mit `is_latest_image()` nach Services mit `:latest`-Images oder ohne - Parst Services via `serde-saphyr` und filtert mit `is_latest_image()` nach Services mit `:latest`-Images oder ohne
expliziten Tag. expliziten Tag.
- Führt `docker pull` für jedes gefundene Image aus und vergleicht Vorher/Nachher-Image-IDs via - Führt `docker pull` für jedes gefundene Image aus und vergleicht Vorher/Nachher-Image-IDs via
`docker image inspect`. `docker image inspect`.
Generated
+115 -27
View File
@@ -2,6 +2,41 @@
# It is not intended for manual editing. # It is not intended for manual editing.
version = 4 version = 4
[[package]]
name = "annotate-snippets"
version = "0.12.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f211a51805bc641f3ad5b7664c77d2547af685cc33b4cd8d31964027a46f13f1"
dependencies = [
"anstyle",
"memchr",
"unicode-width",
]
[[package]]
name = "anstyle"
version = "1.0.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000"
[[package]]
name = "arraydeque"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236"
[[package]]
name = "autocfg"
version = "1.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
[[package]]
name = "base64"
version = "0.23.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
[[package]] [[package]]
name = "cfg-if" name = "cfg-if"
version = "1.0.4" version = "1.0.4"
@@ -29,15 +64,33 @@ checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c"
[[package]] [[package]]
name = "docker-update" name = "docker-update"
version = "0.1.2" version = "1.1.0"
dependencies = [ dependencies = [
"confy", "confy",
"libc 1.0.0-alpha.4", "libc 1.0.0-alpha.4",
"serde", "serde",
"serde_yaml", "serde-saphyr",
"time", "time",
] ]
[[package]]
name = "encoding_rs"
version = "0.8.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
dependencies = [
"cfg-if",
]
[[package]]
name = "encoding_rs_io"
version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fba3fe847045ecff794b9c138293a80db914678c453ad63fbf0c6a9eb6e00b22"
dependencies = [
"encoding_rs",
]
[[package]] [[package]]
name = "equivalent" name = "equivalent"
version = "1.0.2" version = "1.0.2"
@@ -55,6 +108,16 @@ dependencies = [
"windows-sys 0.59.0", "windows-sys 0.59.0",
] ]
[[package]]
name = "granit-parser"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4ccd1be9ebf2bd5520dbfcfb72b70ef492f654061299a097056f3e73410e38ec"
dependencies = [
"arraydeque",
"smallvec",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.17.1" version = "0.17.1"
@@ -80,12 +143,6 @@ dependencies = [
"hashbrown", "hashbrown",
] ]
[[package]]
name = "itoa"
version = "1.0.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682"
[[package]] [[package]]
name = "lazy_static" name = "lazy_static"
version = "1.5.0" version = "1.5.0"
@@ -104,12 +161,33 @@ version = "1.0.0-alpha.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9d0f24f33af482526a4e3f9b47f0abb2c6377a1713c8aa4a8106994689a4cfa5" checksum = "9d0f24f33af482526a4e3f9b47f0abb2c6377a1713c8aa4a8106994689a4cfa5"
[[package]]
name = "memchr"
version = "2.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98"
[[package]]
name = "nohash-hasher"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
[[package]] [[package]]
name = "num-conv" name = "num-conv"
version = "0.2.2" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441" checksum = "521739c6d2bac4aa25192232afe6841231376b2b26d4d9fae5ecf8ca5772e441"
[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
dependencies = [
"autocfg",
]
[[package]] [[package]]
name = "num_threads" name = "num_threads"
version = "0.1.7" version = "0.1.7"
@@ -143,12 +221,6 @@ dependencies = [
"proc-macro2", "proc-macro2",
] ]
[[package]]
name = "ryu"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.229" version = "1.0.229"
@@ -159,6 +231,23 @@ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]]
name = "serde-saphyr"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1ec1f5cac0eb96063c64b28705255a7ed6e7d77f95c1d25e9f8b8c928006ce1"
dependencies = [
"annotate-snippets",
"base64",
"encoding_rs_io",
"granit-parser",
"nohash-hasher",
"num-traits",
"serde_core",
"smallvec",
"zmij",
]
[[package]] [[package]]
name = "serde_core" name = "serde_core"
version = "1.0.229" version = "1.0.229"
@@ -189,17 +278,10 @@ dependencies = [
] ]
[[package]] [[package]]
name = "serde_yaml" name = "smallvec"
version = "0.9.34+deprecated" version = "1.15.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
dependencies = [
"indexmap",
"itoa",
"ryu",
"serde",
"unsafe-libyaml",
]
[[package]] [[package]]
name = "syn" name = "syn"
@@ -310,10 +392,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75"
[[package]] [[package]]
name = "unsafe-libyaml" name = "unicode-width"
version = "0.2.11" version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
[[package]] [[package]]
name = "windows-link" name = "windows-link"
@@ -414,3 +496,9 @@ name = "winnow"
version = "1.0.4" version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81"
[[package]]
name = "zmij"
version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
+5 -5
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "docker-update" name = "docker-update"
version = "0.1.2" version = "1.1.0"
edition = "2024" edition = "2024"
authors = ['DragonSlayer_14'] authors = ['DragonSlayer_14']
readme = "README.md" readme = "README.md"
@@ -9,11 +9,11 @@ repository = "https://gitea.creative-dragonslayer.de/Linuxapps/DockerUpdate"
description = "Automatisches Aktualisieren von Docker-Compose-Anwendungen in /var/apps mit :latest-Images" description = "Automatisches Aktualisieren von Docker-Compose-Anwendungen in /var/apps mit :latest-Images"
[dependencies] [dependencies]
time = { version="0.3.41", features = ["formatting", "macros", "local-offset"] } time = { version = "0.3.55", features = ["formatting", "macros", "local-offset"] }
serde = { version="1.0.219", features = ["derive"] } serde = { version = "1.0.229", features = ["derive"] }
serde_yaml = "0.9" serde-saphyr = "1.1.0"
confy = "2.0.0" confy = "2.0.0"
libc = "1.0.0-alpha.1" libc = "1.0.0-alpha.4"
[profile.release] [profile.release]
debug = "none" debug = "none"
+39 -9
View File
@@ -29,7 +29,7 @@ auf neuere Versionen prüft, aktualisiert und neu startet.
## Voraussetzungen ## Voraussetzungen
- **Betriebssystem**: Linux (x86_64, aarch64) - **Betriebssystem**: Linux (amd64 / x86_64, arm64 / aarch64, i386 / i686)
- **Laufzeit-Abhängigkeiten**: - **Laufzeit-Abhängigkeiten**:
- `docker` (inkl. Docker Compose Plugin `docker compose` oder Standalone `docker-compose`) - `docker` (inkl. Docker Compose Plugin `docker compose` oder Standalone `docker-compose`)
- `sudo` - `sudo`
@@ -130,14 +130,36 @@ zypper install docker-update
### 3. Arch Linux (`pacman`) ### 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) #### Stable (Produktiv)
Füge das Repository in `/etc/pacman.conf` ein: Füge das Repository in `/etc/pacman.conf` ein:
```ini ```ini
[docker-update-stable] [stable]
SigLevel = Optional TrustAll SigLevel = Optional TrustAll
Server = https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/stable/x86_64 Server = https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/stable/$arch
``` ```
Installiere das Paket anschließend: Installiere das Paket anschließend:
@@ -151,9 +173,9 @@ sudo pacman -Sy docker-update
Füge das Testing-Repository in `/etc/pacman.conf` ein: Füge das Testing-Repository in `/etc/pacman.conf` ein:
```ini ```ini
[docker-update-testing] [testing]
SigLevel = Optional TrustAll SigLevel = Optional TrustAll
Server = https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/testing/x86_64 Server = https://gitea.creative-dragonslayer.de/api/packages/Linuxapps/arch/testing/$arch
``` ```
Installiere das Paket: Installiere das Paket:
@@ -246,16 +268,19 @@ Die Paketkonfiguration und Abhängigkeiten (`sudo`, `docker.io | docker-ce`) sin
Die Paketmetadaten und Abhängigkeiten für Arch Linux sind direkt in `Cargo.toml` unter `[package.metadata.arch]` 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 hinterlegt. Das Paket kann nach dem Kompilieren des Release-Builds über das Skript `scripts/package-arch.py` (analog zu
CI/CD) erzeugt CI/CD) erzeugt werden (optional mit `--target <TRIPLE>` für Cross-Builds):
werden:
```bash ```bash
# Release kompilieren # Release kompilieren
cargo build --release cargo build --release
# Arch Linux-Paket (.pkg.tar.zst) erstellen # Arch Linux-Paket (.pkg.tar.zst) erstellen (Standard: Host/x86_64)
python3 scripts/package-arch.py python3 scripts/package-arch.py
# Optional für spezifische Zielarchitektur:
# python3 scripts/package-arch.py --target aarch64-unknown-linux-gnu
# python3 scripts/package-arch.py --target i686-unknown-linux-gnu
# Installation des erstellten Pakets # Installation des erstellten Pakets
sudo pacman -U target/arch/docker-update-*.pkg.tar.zst sudo pacman -U target/arch/docker-update-*.pkg.tar.zst
``` ```
@@ -275,6 +300,11 @@ cargo install cargo-generate-rpm
cargo build --release cargo build --release
cargo generate-rpm cargo generate-rpm
# Optional für spezifische Zielarchitektur (z.B. Cross-Builds):
# mkdir -p target/generate-rpm
# cargo generate-rpm --target aarch64-unknown-linux-gnu -o target/generate-rpm
# cargo generate-rpm --target i686-unknown-linux-gnu -o target/generate-rpm
# Installation des erstellten RPM-Pakets # Installation des erstellten RPM-Pakets
sudo dnf install target/generate-rpm/docker-update-*.rpm sudo dnf install target/generate-rpm/docker-update-*.rpm
``` ```
+164
View File
@@ -0,0 +1,164 @@
#!/usr/bin/env python3
"""
Ermittelt automatisch die nächste Build-Nummer (Revision / Release / pkgrel)
für eine gegebene Paket-Version (z. B. 1.0.2 -> wenn 1.0.2-1 existiert, wird 2 zurückgegeben).
"""
import argparse
import json
import os
import re
import subprocess
import sys
import urllib.parse
import urllib.request
def get_cargo_pkg_info():
try:
metadata = json.loads(subprocess.check_output(["cargo", "metadata", "--format-version", "1", "--no-deps"]))
pkg = metadata["packages"][0]
name = pkg.get("name", "docker-update")
version = pkg.get("version", "1.0.0")
repository = pkg.get("repository", "")
return name, version, repository
except Exception:
# Fallback auf einfaches Parsen der Cargo.toml
name = "docker-update"
version = "1.0.0"
repository = ""
if os.path.exists("Cargo.toml"):
with open("Cargo.toml", "r") as f:
for line in f:
line = line.strip()
if line.startswith("name ="):
name = line.split("=", 1)[1].strip().strip('"\'')
elif line.startswith("version ="):
version = line.split("=", 1)[1].strip().strip('"\'')
elif line.startswith("repository ="):
repository = line.split("=", 1)[1].strip().strip('"\'')
return name, version, repository
def parse_repo_info(repo_url):
"""Extrahiert Server-URL, Owner und Repo-Name aus einer Repository-URL."""
if not repo_url:
return None, None, None
parsed = urllib.parse.urlparse(repo_url)
server_url = f"{parsed.scheme}://{parsed.netloc}"
path_parts = [p for p in parsed.path.strip("/").split("/") if p]
if len(path_parts) >= 2:
owner = path_parts[0]
repo_name = path_parts[1]
if repo_name.endswith(".git"):
repo_name = repo_name[:-4]
return server_url, f"{owner}/{repo_name}", owner
return server_url, None, None
def query_existing_build_numbers(name, version, gitea_url, repo, owner, token=None):
build_nums = set()
pattern = re.compile(rf'(?:{re.escape(name)}[_-]|^v?){re.escape(version)}-(\d+)')
headers = {"User-Agent": "docker-update-build-resolver"}
if token:
headers["Authorization"] = f"token {token}"
# 1. Gitea Releases API
if gitea_url and repo:
try:
url = f"{gitea_url.rstrip('/')}/api/v1/repos/{repo}/releases?limit=50"
req = urllib.request.Request(url, headers=headers)
with urllib.request.urlopen(req, timeout=10) as resp:
releases = json.loads(resp.read().decode())
for rel in releases:
tag = rel.get("tag_name", "")
m = pattern.search(tag)
if m:
build_nums.add(int(m.group(1)))
for asset in rel.get("assets", []):
asset_name = asset.get("name", "")
m = pattern.search(asset_name)
if m:
build_nums.add(int(m.group(1)))
except Exception as e:
sys.stderr.write(f"[Hinweis] Konnte Gitea Releases nicht abfragen: {e}\n")
# 2. Gitea Packages API (falls Token vorhanden)
if gitea_url and owner and token:
try:
url = f"{gitea_url.rstrip('/')}/api/v1/packages/{owner}?limit=50"
req = urllib.request.Request(url, headers=headers)
with urllib.request.urlopen(req, timeout=10) as resp:
packages = json.loads(resp.read().decode())
for pkg in packages:
pkg_ver = pkg.get("version", "")
m = pattern.search(pkg_ver)
if m:
build_nums.add(int(m.group(1)))
except Exception as e:
sys.stderr.write(f"[Hinweis] Konnte Gitea Packages nicht abfragen: {e}\n")
# 3. Lokales Target-Verzeichnis prüfen
target_dirs = ["target/debian", "target/generate-rpm", "target/arch"]
for t_dir in target_dirs:
if os.path.isdir(t_dir):
for file in os.listdir(t_dir):
m = pattern.search(file)
if m:
build_nums.add(int(m.group(1)))
return build_nums
def get_next_build_number(version=None, gitea_url=None, repo=None, owner=None, token=None, explicit_build_num=None):
if explicit_build_num is not None:
return int(explicit_build_num)
env_build_num = os.environ.get("BUILD_NUMBER") or os.environ.get("BUILD_NUM") or os.environ.get("PKGREL")
if env_build_num:
try:
return int(env_build_num)
except ValueError:
pass
pkg_name, pkg_version, pkg_repo = get_cargo_pkg_info()
if not version:
version = pkg_version
default_server, default_repo, default_owner = parse_repo_info(pkg_repo)
gitea_url = gitea_url or os.environ.get("GITEA_URL") or os.environ.get("GITHUB_SERVER_URL") or default_server
repo = repo or os.environ.get("REPO") or os.environ.get("GITHUB_REPOSITORY") or default_repo
owner = owner or os.environ.get("REPO_OWNER") or os.environ.get("GITHUB_REPOSITORY_OWNER") or default_owner
token = token or os.environ.get("TOKEN") or os.environ.get("GITEA_TOKEN") or os.environ.get("PACKAGE_TOKEN") or os.environ.get("RELEASE_TOKEN")
existing_nums = query_existing_build_numbers(pkg_name, version, gitea_url, repo, owner, token)
if existing_nums:
return max(existing_nums) + 1
return 1
def main():
parser = argparse.ArgumentParser(description="Ermittelt die nächste Build-Nummer für die Paketierung.")
parser.add_argument("--version", help="Paket-Version (Standard: aus Cargo.toml)")
parser.add_argument("--gitea-url", help="Gitea Basis-URL")
parser.add_argument("--repo", help="Repository (z. B. Owner/Repo)")
parser.add_argument("--owner", help="Repository Owner / Organisation")
parser.add_argument("--token", help="API-Token")
parser.add_argument("--build-number", type=int, help="Explizite Build-Nummer erzwingen")
args = parser.parse_args()
build_num = get_next_build_number(
version=args.version,
gitea_url=args.gitea_url,
repo=args.repo,
owner=args.owner,
token=args.token,
explicit_build_num=args.build_number,
)
print(build_num)
if __name__ == "__main__":
main()
+79 -4
View File
@@ -1,12 +1,51 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse
import importlib.util
import json import json
import os import os
import subprocess import subprocess
import sys
import tempfile import tempfile
import time import time
TARGET_ARCH_MAP = {
"x86_64-unknown-linux-gnu": "x86_64",
"x86_64-unknown-linux-musl": "x86_64",
"x86_64": "x86_64",
"amd64": "x86_64",
"aarch64-unknown-linux-gnu": "aarch64",
"aarch64-unknown-linux-musl": "aarch64",
"aarch64": "aarch64",
"arm64": "aarch64",
"i686-unknown-linux-gnu": "i686",
"i686-unknown-linux-musl": "i686",
"i686": "i686",
"i386": "i686",
}
def main():
def resolve_pkgrel(version=None, default="1"):
# 1. Environment Variable
env_pkgrel = os.environ.get("BUILD_NUMBER") or os.environ.get("BUILD_NUM") or os.environ.get("PKGREL")
if env_pkgrel:
return str(env_pkgrel)
# 2. get-build-number.py falls vorhanden
script_dir = os.path.dirname(os.path.abspath(__file__))
getter_path = os.path.join(script_dir, "get-build-number.py")
if os.path.exists(getter_path):
try:
spec = importlib.util.spec_from_file_location("get_build_number", getter_path)
module = importlib.util.module_from_spec(spec)
spec.loader.exec_module(module)
return str(module.get_next_build_number(version=version))
except Exception as e:
sys.stderr.write(f"[Hinweis] Konnte get-build-number nicht ausführen: {e}\n")
return str(default)
def build_package(target_triple=None, target_arch=None, pkgrel=None):
metadata = json.loads(subprocess.check_output(["cargo", "metadata", "--format-version", "1", "--no-deps"])) metadata = json.loads(subprocess.check_output(["cargo", "metadata", "--format-version", "1", "--no-deps"]))
pkg = metadata["packages"][0] pkg = metadata["packages"][0]
name = pkg["name"] name = pkg["name"]
@@ -18,8 +57,34 @@ def main():
author = authors[0] if authors else "Unknown" author = authors[0] if authors else "Unknown"
arch_meta = pkg.get("metadata", {}).get("arch", {}) arch_meta = pkg.get("metadata", {}).get("arch", {})
pkgrel = arch_meta.get("pkgrel", "1") default_pkgrel = arch_meta.get("pkgrel", "1")
arch = arch_meta.get("arch", "x86_64") if not pkgrel:
pkgrel = resolve_pkgrel(version=version, default=default_pkgrel)
default_arch = arch_meta.get("arch", "x86_64")
if target_arch:
arch = TARGET_ARCH_MAP.get(target_arch, target_arch)
elif target_triple:
arch = TARGET_ARCH_MAP.get(target_triple, default_arch)
else:
arch = default_arch
candidate_paths = []
if target_triple:
candidate_paths.append(f"target/{target_triple}/release/{name}")
candidate_paths.append(f"target/release/{name}")
bin_path = None
for p in candidate_paths:
if os.path.exists(p):
bin_path = p
break
if not bin_path:
raise FileNotFoundError(
f"Keine kompilierte Binary für {name} gefunden. Gesuchte Pfade: {candidate_paths}"
)
depends = arch_meta.get("depends", ["gcc-libs", "glibc", "sudo", "docker-ce-cli", "docker-compose-plugin"]) 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"]) optdepends = arch_meta.get("optdepends", ["docker-compose: Unterstützung für Docker Compose v1"])
@@ -31,7 +96,7 @@ def main():
os.makedirs(doc_dir, exist_ok=True) os.makedirs(doc_dir, exist_ok=True)
os.makedirs(lic_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) subprocess.run(["install", "-m", "755", bin_path, f"{bin_dir}/{name}"], check=True)
if os.path.exists("LICENSE"): if os.path.exists("LICENSE"):
subprocess.run(["install", "-m", "644", "LICENSE", f"{lic_dir}/LICENSE"], check=True) subprocess.run(["install", "-m", "644", "LICENSE", f"{lic_dir}/LICENSE"], check=True)
if os.path.exists("README.md"): if os.path.exists("README.md"):
@@ -67,5 +132,15 @@ def main():
print(f"Arch-Paket erfolgreich erstellt: {output_file}") print(f"Arch-Paket erfolgreich erstellt: {output_file}")
def main():
parser = argparse.ArgumentParser(description="Erstellt Arch Linux-Pakete (.pkg.tar.zst)")
parser.add_argument("--target", help="Rust Target-Triple (z.B. x86_64-unknown-linux-gnu, aarch64-unknown-linux-gnu, i686-unknown-linux-gnu)")
parser.add_argument("--arch", help="Architektur (z.B. x86_64, aarch64, i686)")
parser.add_argument("--pkgrel", help="Release-/Build-Nummer (z.B. 1, 2, ...)")
args = parser.parse_args()
build_package(target_triple=args.target, target_arch=args.arch, pkgrel=args.pkgrel)
if __name__ == "__main__": if __name__ == "__main__":
main() main()
+1 -1
View File
@@ -66,7 +66,7 @@ pub fn parse_compose_services(compose_path: &Path) -> Result<Vec<(String, String
) )
})?; })?;
let compose: ComposeFile = serde_yaml::from_str(&content).map_err(|e| { let compose: ComposeFile = serde_saphyr::from_str(&content).map_err(|e| {
format!( format!(
"Fehler beim Parsen der YAML-Datei '{}': {}", "Fehler beim Parsen der YAML-Datei '{}': {}",
compose_path.display(), compose_path.display(),