Skip to content

Commit dfdc0e1

Browse files
author
B&R
committed
fix: Versioning
1 parent 77ddaf5 commit dfdc0e1

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

helm/wordpress-hardened/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ apiVersion: v2
22
name: wordpress-hardened
33
description: "Lightweight Wordpress installation with additional security fixes"
44
type: application
5-
version: 0.0-latest-master
6-
appVersion: "" # replaced by CI on build stage
5+
version: 0.0.0-latest-master
6+
appVersion: "master" # replaced by CI on build stage
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
#!/bin/bash
22
set -e
3-
cat ../../Dockerfile | grep "FROM wordpress" | grep -P -o '[0-9.]+' | head -1
3+
4+
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
5+
echo -n $(cat ${SCRIPT_DIR}/../../../Dockerfile | grep "FROM wordpress" | grep -P -o '[0-9.]+' | head -1)

helm/wordpress-hardened/templates/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ spec:
136136
# WordPress container
137137
# ================================================================
138138
- name: app
139-
image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
139+
image: {{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}
140140
imagePullPolicy: Always
141141
env:
142142
{{- with .Values.env }}

0 commit comments

Comments
 (0)