fix: Versioning

riotkit-org · Mar 25, 2023 · dfdc0e1 · dfdc0e1
1 parent 77ddaf5
commit dfdc0e1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/helm/wordpress-hardened/Chart.yaml b/helm/wordpress-hardened/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: wordpress-hardened
 description: "Lightweight Wordpress installation with additional security fixes"
 type: application
-version: 0.0-latest-master
-appVersion: "" # replaced by CI on build stage
+version: 0.0.0-latest-master
+appVersion: "master" # replaced by CI on build stage
diff --git a/helm/wordpress-hardened/bin/get-app-version b/helm/wordpress-hardened/bin/get-app-version
@@ -1,3 +1,5 @@
 #!/bin/bash
 set -e
-cat ../../Dockerfile | grep "FROM wordpress" | grep -P -o '[0-9.]+' | head -1
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+echo -n $(cat ${SCRIPT_DIR}/../../../Dockerfile | grep "FROM wordpress" | grep -P -o '[0-9.]+' | head -1)
diff --git a/helm/wordpress-hardened/templates/deployment.yaml b/helm/wordpress-hardened/templates/deployment.yaml
@@ -136,7 +136,7 @@ spec:
                 #  WordPress container
                 # ================================================================
                 - name: app
-                  image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+                  image: {{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
                   imagePullPolicy: Always
                   env:
                       {{- with .Values.env }}