From 99fd37bfd8b37bad21f1a570f478dc8dae13d8f6 Mon Sep 17 00:00:00 2001 From: "d.viti" Date: Fri, 3 Oct 2025 02:23:32 +0200 Subject: [PATCH] Use gitea.repository variable for dynamic image repository paths - Updated values.yaml to use gitea.repository placeholder - Modified build.yml workflow to replace repository path dynamically - Modified helm-release.yml workflow to replace repository path - This allows the Helm chart to work with any Gitea repository structure - Image paths are now built as: registry/gitea.repository/component --- .gitea/workflows/build.yml | 3 ++- .gitea/workflows/helm-release.yml | 3 ++- helm/api7ee/values.yaml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 259c1b5..4188c75 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -109,8 +109,9 @@ jobs: # Get version from Chart.yaml CHART_VERSION=$(grep '^version:' helm/api7ee/Chart.yaml | awk '{print $2}') - # Update image registry in values.yaml to match Gitea registry + # Update image registry and repository in values.yaml to match Gitea sed -i "s|registry: gitea.server_url|registry: ${{ gitea.server_url }}|g" helm/api7ee/values.yaml + sed -i "s|repository: gitea.repository/|repository: ${{ gitea.repository }}/|g" helm/api7ee/values.yaml # Package the chart helm package helm/api7ee/ --version ${CHART_VERSION} diff --git a/.gitea/workflows/helm-release.yml b/.gitea/workflows/helm-release.yml index e38a162..a91eb52 100644 --- a/.gitea/workflows/helm-release.yml +++ b/.gitea/workflows/helm-release.yml @@ -46,8 +46,9 @@ jobs: # Update image tags in values.yaml to use this version sed -i "s|tag: \"main\"|tag: \"v${VERSION}\"|g" helm/api7ee/values.yaml - # Update registry to Gitea URL + # Update registry and repository to Gitea values sed -i "s|registry: gitea.server_url|registry: ${{ gitea.server_url }}|g" helm/api7ee/values.yaml + sed -i "s|repository: gitea.repository/|repository: ${{ gitea.repository }}/|g" helm/api7ee/values.yaml echo "📝 Updated Chart.yaml and values.yaml with version ${VERSION}" diff --git a/helm/api7ee/values.yaml b/helm/api7ee/values.yaml index 37d1739..520cdee 100644 --- a/helm/api7ee/values.yaml +++ b/helm/api7ee/values.yaml @@ -15,7 +15,7 @@ web: image: registry: gitea.server_url # Will be replaced with actual Gitea URL - repository: demos/api7-demo/web + repository: gitea.repository/web # Will be replaced with actual repository path pullPolicy: IfNotPresent tag: "main" # Override with specific version @@ -69,7 +69,7 @@ api: image: registry: gitea.server_url # Will be replaced with actual Gitea URL - repository: demos/api7-demo/api + repository: gitea.repository/api # Will be replaced with actual repository path pullPolicy: IfNotPresent tag: "main" # Override with specific version