15 Commits

Author SHA1 Message Date
8ed24361bf Removed invisible chars and printing of signing key in workflows file
All checks were successful
Package & Sign Helm Chart / build (release) Successful in 1m24s
2025-06-12 19:50:18 +02:00
c4fae1e2d8 Update Chart.yaml and CHANGELOG for BookStack v25.5.0 release 2025-06-12 19:49:29 +02:00
25707b7f89 Fixed some formating issues 2025-05-15 22:58:04 +02:00
61d3bc4aba Update description in Chart.yaml to clarify deployment details for BookStack 2025-05-15 22:57:23 +02:00
bc5138ef84 Merge remote-tracking branch 'origin/renovate/ubuntu-24.x' 2025-05-15 22:56:30 +02:00
fe12222722 Update GPG key reference in Helm package command to use specific signing key
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 14s
2025-05-12 23:04:25 +02:00
be91c9677a Add step to display GPG keys in CI environment
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 12s
2025-05-12 23:02:48 +02:00
33fbe9e443 Add error handling to legacy secret-keyring build step
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 13s
2025-05-12 22:50:14 +02:00
c09e1a2978 Update PGP public key block with new key data
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 29s
2025-05-12 22:41:15 +02:00
337b9e9f0b Fix GPG command to include passphrase for secret key export in package-and-deploy workflow
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 20s
2025-05-12 22:21:31 +02:00
91bb7a4fd1 Enhance GPG command in secret-keyring build step with additional flags for improved functionality
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 28s
2025-05-12 22:19:21 +02:00
005aab7ec9 Fix GPG command to use batch mode for secret-keyring build step
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 36s
2025-05-12 22:16:55 +02:00
c2ccd5e27f Fix GPG command to remove unnecessary batch flag in secret-keyring build step
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 25s
2025-05-12 22:12:50 +02:00
7cf5f43299 Fix output redirection syntax for GPG secret key export in package-and-deploy workflow
Some checks failed
Package & Sign Helm Chart / build (release) Failing after 22s
2025-05-12 22:08:58 +02:00
55ca2b3af4 Update dependency ubuntu to v24 2025-05-08 13:16:00 +00:00
7 changed files with 70 additions and 37 deletions

View File

@@ -6,7 +6,7 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-22.04 runs-on: ubuntu-24.04
env: env:
CHART_DIR: bookstack/ CHART_DIR: bookstack/
CHART_VERSION: ${{ github.event.release.tag_name }} CHART_VERSION: ${{ github.event.release.tag_name }}
@@ -31,18 +31,20 @@ jobs:
passphrase: ${{ secrets.GPG_PASSPHRASE }} passphrase: ${{ secrets.GPG_PASSPHRASE }}
trust_level: 5 trust_level: 5
# 4) Generation1”SecretRing für Helm erzeugen (TMP, 600Rechte) # 3) "Generation-1"-Secret-Ring für Helm erzeugen (TMP, 600 Rechte)
- name: Build legacy secret-keyring - name: Build legacy secret-keyring
run: | run: |
set -euo pipefail
install -m 700 -d /tmp/gpgring install -m 700 -d /tmp/gpgring
gpg --batch --pinentry-mode loopback \ gpg --batch --yes --pinentry-mode loopback \
--passphrase "$PASSPHRASE" \
--export-secret-keys "$GPG_KEY_ID" \ --export-secret-keys "$GPG_KEY_ID" \
--output /tmp/gpgring/secring.gpg >/tmp/gpgring/secring.gpg
chmod 600 /tmp/gpgring/secring.gpg chmod 600 /tmp/gpgring/secring.gpg
echo "$PASSPHRASE" > /tmp/gpgring/passphrase.txt echo "$PASSPHRASE" > /tmp/gpgring/passphrase.txt
chmod 600 /tmp/gpgring/passphrase.txt chmod 600 /tmp/gpgring/passphrase.txt
# 5) Chart bauen & signieren # 4) Chart bauen & signieren
- name: Package & sign chart - name: Package & sign chart
run: | run: |
cp README.md "$CHART_DIR"/ cp README.md "$CHART_DIR"/
@@ -50,11 +52,11 @@ jobs:
helm package "$CHART_DIR" \ helm package "$CHART_DIR" \
--version "$CHART_VERSION" \ --version "$CHART_VERSION" \
--sign \ --sign \
--key "$GPG_KEY_ID" \ --key "Morlana Signing" \
--keyring /tmp/gpgring/secring.gpg \ --keyring /tmp/gpgring/secring.gpg \
--passphrase-file /tmp/gpgring/passphrase.txt --passphrase-file /tmp/gpgring/passphrase.txt
# 6) In dein internes ChartRepo hochladen # 5) In dein internes Chart-Repo hochladen
- name: Upload to ChartMuseum - name: Upload to ChartMuseum
env: env:
REPO_CREDENTIALS: ${{ secrets.REPO_CREDENTIALS }} REPO_CREDENTIALS: ${{ secrets.REPO_CREDENTIALS }}
@@ -64,7 +66,7 @@ jobs:
-F "prov=@bookstack-$CHART_VERSION.tgz.prov" \ -F "prov=@bookstack-$CHART_VERSION.tgz.prov" \
https://charts.morlana.net/api/charts https://charts.morlana.net/api/charts
# 7) PublicKey aus Repo beilegen und als ReleaseAsset anhängen # 6) Public-Key aus Repo beilegen und als Release-Asset anhängen
- name: Attach release assets - name: Attach release assets
uses: softprops/action-gh-release@v2 uses: softprops/action-gh-release@v2
with: with:
@@ -74,7 +76,7 @@ jobs:
bookstack-${{ env.CHART_VERSION }}.tgz.prov bookstack-${{ env.CHART_VERSION }}.tgz.prov
pubkeys/morlana.asc pubkeys/morlana.asc
# 8) Aufräumen (optional, Runner ist ohnehin kurzlebig) # 7) Aufräumen (optional, Runner ist ohnehin kurzlebig)
- name: Cleanup sensitive files - name: Cleanup sensitive files
if: ${{ always() }} if: ${{ always() }}
run: rm -rf /tmp/gpgring run: rm -rf /tmp/gpgring

9
.vscode/settings.json vendored Normal file
View File

@@ -0,0 +1,9 @@
{
"github.copilot.enable": {
"*": true,
"plaintext": false,
"markdown": false,
"scminput": false,
"yaml": true
}
}

View File

@@ -1,6 +1,15 @@
# Changelog # Changelog
## 0.1.0+up25.5.0 - 2025-06-12
- **Changed** ✦ Packages upstream BookStack v25.5.0
- [Release Notes](https://github.com/solidnerd/docker-bookstack/releases/tag/25.5.0)
- [Project homepage](https://www.bookstackapp.com/)
## 0.1.0+up25.2.3 2025-05-08 ## 0.1.0+up25.2.3 2025-05-08
- **Added** Initial Helm chart for BookStack. ✦ Packages upstream BookStack v25.2.3 [Project homepage](https://www.bookstackapp.com/) - **Added** Initial Helm chart for BookStack.
- ✦ Packages upstream BookStack v25.2.3
- [Project homepage](https://www.bookstackapp.com/)
- **Added** ✦ Ingress, persistence, TLS and SMTP settings readymade - **Added** ✦ Ingress, persistence, TLS and SMTP settings readymade
- **Added** ✦ Includes optional MariaDB and Redis subcharts [MariaDB subchart](https://artifacthub.io/packages/helm/bitnami/mariadb) [Redis subchart](https://artifacthub.io/packages/helm/bitnami/redis) - **Added** ✦ Includes optional MariaDB and Redis subcharts
- [MariaDB subchart](https://artifacthub.io/packages/helm/bitnami/mariadb)
- [Redis subchart](https://artifacthub.io/packages/helm/bitnami/redis)

View File

@@ -1,6 +1,6 @@
# BookStack Helm Chart # BookStack Helm Chart
Deploys the BookStack wiki platform on Kubernetes with optional MariaDB and Redis subcharts. Deploys the BookStack wiki platform on Kubernetes with optional MariaDB and Redis sub-charts.
--- ---

View File

@@ -1,12 +1,13 @@
apiVersion: v2 apiVersion: v2
name: bookstack name: bookstack
description: A Helm chart for Kubernetes description: |
Deploys the BookStack wiki platform on Kubernetes with optional MariaDB and Redis sub-charts.
type: application type: application
version: "0.1.0+up25.2.3" version: "0.1.0+up25.5.0"
appVersion: "25.2.3" appVersion: "25.5.0"
dependencies: dependencies:
- name: mariadb - name: mariadb
@@ -32,20 +33,13 @@ annotations:
- name: Florian Weber - name: Florian Weber
email: kosmos@morlana.net email: kosmos@morlana.net
artifacthub.io/signKey: | artifacthub.io/signKey: |
fingerprint: BCE21EEA25DE14B418196DA1FF6F7246FAA99C30 fingerprint: 8975 6E20 1E4C 99B1 A2E9 5712 DF7D F259 CD8F CAAA
url: https://raw.githubusercontent.com/flweber/helm-bookstack/refs/heads/main/pubkeys/morlana.asc url: https://raw.githubusercontent.com/flweber/helm-bookstack/refs/heads/main/pubkeys/morlana.asc
artifacthub.io/changes: | artifacthub.io/changes: |
- kind: added - kind: changed
description: Initial Helm chart for BookStack. ✦ Packages upstream BookStack v25.2.3 description: ✦ Packages upstream BookStack v25.5.0
links: links:
- name: Release Notes
url: https://github.com/solidnerd/docker-bookstack/releases/tag/25.5.0
- name: Project homepage - name: Project homepage
url: https://www.bookstackapp.com/ url: https://www.bookstackapp.com/
- kind: added
description: ✦ Ingress, persistence, TLS and SMTP settings readymade
- kind: added
description: ✦ Includes optional MariaDB and Redis subcharts
links:
- name: MariaDB subchart
url: https://artifacthub.io/packages/helm/bitnami/mariadb
- name: Redis subchart
url: https://artifacthub.io/packages/helm/bitnami/redis

View File

@@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
""" """
generate_changelog.py Wandelt den ArtifactHubChangelog in Chart.yaml generate_changelog.py - Wandelt den Artifact Hub-Changelog in Chart.yaml
in eine MarkdownDatei (CHANGELOG.md) um. in eine Markdown-Datei (CHANGELOG.md) um.
Aufruf: Aufruf:
python generate_changelog.py # takes ./Chart.yaml python generate_changelog.py # takes ./Chart.yaml
@@ -42,7 +42,7 @@ def render_markdown(chart: dict, changes: list[dict]) -> str:
version = chart.get("version", "Unversioniert") version = chart.get("version", "Unversioniert")
today = dt.date.today().isoformat() today = dt.date.today().isoformat()
heading = f"## {version} {today}\n" heading = f"## {version} - {today}\n"
bullets = [] bullets = []
for item in changes: for item in changes:

View File

@@ -1,10 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
mDMEaBxO9xYJKwYBBAHaRw8BAQdA/7OLLFRkqsTzyufHwHVgB7M6XoX9+df8qCvi mQINBGgiWykBEACtiiNGno+ZL99rI0qP98Ei+HNcs/MgBWqjPa3/nYv6wK1FVEhu
u5xQM7i0OE1vcmxhbmEgQ0kgU2lnbmluZyBLZXkgPGNvbnRhY3QrZGV2ZWxvcG1l 95w/4Oh/EBEP7vuq5lDfC2JQHiif6AHu4tBB6V2Hx3XLyZE9HY+7SuqIWzeGGr2F
bnRAbW9ybGFuYS5uZXQ+iJYEExYIAD4WIQS84h7qJd4UtBgZbaH/b3JG+qmcMAUC GlD8GkEQ4/HtdHDK+htFUgTPrzW7f/ax5pgvvzAXQcXnC6fIOGsd2IJO0LoEjhTn
aBxO9wIbAwUJAeEzgAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRD/b3JG+qmc KJQqEOgPqGjyfND9+3bfscLJi2CSK23pWz30f1sTzqLM4eMN7poXGqjwjtyKwGog
MLuMAQDM/CPa1DO31dmcI5Xtt9uK3svdv3mZl5GGqqTylcYTXgD+LL4/OPp7XHx+ j66t6Na6A/B3AU9QPP5BB1/Qj09FVsd/InLsyelULG1fZmY0wx2/wiE0VNhenjGa
WTf9NitfTlwpRKJJWec7vp2NG0NQ8wg= EejCp8oHieZ++x811ux6wROdJc38HC5lJfXhyob3yJ2OXeGBYnZG8PrT2CqJpTXz
=ACKv W/5kDVYAyKOh2iiPGADGlMOajnyCgtRI9YEsKYybxlRW7vuvh7ItHb7/iplbamgx
RUrxiJGDMTEENsePTQq4pGOblXptw6PiIogGv9kWJ9WaEIbbAlFJmAIOh2JXRF+Y
JgaCzUjUNRv/z3P5Ymwd2qYxp+RO8QVCPs+/PAqL0BgwCFQXhOC5Yez3/89D5tKy
UOMBxK+xP3i7mj5C6BZa+1ChMdN9yUYpGKVfm16xLVrGBbwWZI6YB4qF+3n4qUtp
Ld7CVEzPVarftb8UpIaqAO/R/MYPUAJeKCykHrlaaOqkj3Dhacqgl+h9FQARAQAB
tDFNb3JsYW5hIFNpZ25pbmcgPGNvbnRhY3QrZGV2ZWxvcG1lbnRAbW9ybGFuYS5u
ZXQ+iQJOBBMBCgA4FiEEiXVuIB5MmbGi6VcS333yWc2PyqoFAmgiWykCGwMFCwkI
BwIGFQoJCAsCBBYCAwECHgECF4AACgkQ333yWc2PyqrhXA//SnEa+hG0hIAB4Ua/
qgqv/7nzpRIFAA5tqSoOPZ0p4YvtsSywc7zJ+ZH7IClvlewOo0Omeo4XiYQCLYSL
LnYv/yqrWVNU35TI29k2RTE4pmcHB9hMdG8heI2c5O3vd9C4yQCWwWKMSD3pEPrq
aLkHkQvLyXZukBeMzNFaVK4wOjPB02MadQLIu9rbUbKW9DvUmt/x8uBVmm/Pq4Ds
HBgxdnOifEhzMG2gG+4UJYt2jfibMwCJpM4d/drs28Qf9dhjj1UHzhhwBW3OpJkJ
E+hHVMObzolefh4eR3gPctIkxuVjYC91FVZkqVV3TgrLKhfgro5ML7IFgCnzHVuZ
PKJsssNZds+2Sv/nf2QtXcGvQgZ3xjNlaQUxE0WTGe+DKx4pMyxx4s+eNYGhA5Yo
rrb9on8TfDNaexU0BDUyt3DLQVxk8niqQPmj9jmD+BrsjWnj7Dn1yCgjre/viZjH
Ys8AHwxSu4qh3XBtjUQ9YDhUMmNqIOtJHiVp97kWbLbQ7CiCI+/7IT6Pk50+GzXV
KaTRfEp6zxpMx2wgsw4CP7aKukLrIFWxDNyQ+030c8TQW8WuL1W3oTzh0iu7DCgR
XVmgS6+YAbxjX/gAD0Dx3jLftQ2Y3PGMWPXtZmtZucIFhg1ArmYb2v1n8sWMi+cK
k/0Bxc8p29/H9s7dv5pVyrx2fcM=
=o6F8
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----