Merge branch 'release/v14.12-2'

Author: nhinze23

.env.template

@@ -0,0 +1,6 @@
+STAGE=development
+LOG_LEVEL=debug
+NAMESPACE=ecosystem
+
+#RUNTIME_ENV=remote
+#KUBE_CONTEXT_NAME=gke_ces-operations-internal_europe-west3-c_ces-test-troubleshooting

.gitignore

@@ -107,3 +107,6 @@ modules.xml
 .nfs*
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij+all,linux
+/.env
+/target/
+/.bin/

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v14.12-2] - 2024-09-05
+### Fixed
+- [#34] Add missing local-config volume
+
 ## [v14.12-1] - 2024-08-28
 ### Changed
 - [#32] Update postgresql to v14.12

Dockerfile

@@ -18,7 +18,7 @@ RUN set -x -o errexit \
 FROM registry.cloudogu.com/official/base:3.20.2-1
 
 LABEL NAME="official/postgresql" \
-        VERSION="14.12-1" \
+        VERSION="14.12-2" \
         maintainer="[email protected]"
 
 ENV LANG=en_US.utf8 \

Makefile

@@ -1,8 +1,9 @@
-MAKEFILES_VERSION=9.1.0
+MAKEFILES_VERSION=9.2.0
 
 .DEFAULT_GOAL:=dogu-release
 
 include build/make/variables.mk
 include build/make/self-update.mk
 include build/make/release.mk
 include build/make/bats.mk
+include build/make/k8s-dogu.mk

build/make/bats.mk

@@ -9,7 +9,7 @@ BATS_SUPPORT=$(BATS_LIBRARY_DIR)/bats-support
 BATS_FILE=$(BATS_LIBRARY_DIR)/bats-file
 BATS_BASE_IMAGE?=bats/bats
 BATS_CUSTOM_IMAGE?=cloudogu/bats
-BATS_TAG?=1.2.1
+BATS_TAG?=1.11.0
 BATS_DIR=build/make/bats
 BATS_WORKDIR="${WORKDIR}"/"${BATS_DIR}"
 

build/make/bats/Dockerfile

@@ -1,7 +1,9 @@
 ARG BATS_BASE_IMAGE
 ARG BATS_TAG
 
-FROM ${BATS_BASE_IMAGE}:${BATS_TAG}
+FROM ${BATS_BASE_IMAGE:-bats/bats}:${BATS_TAG:-1.11.0}
 
 # Make bash more findable by scripts and tests
 RUN apk add make git bash
+# suppress git "detected dubious ownership" error/warning for repos which are checked out later
+RUN git config --global --add safe.directory /workspace

build/make/vulnerability-scan.mk

@@ -0,0 +1,13 @@
+##@ Vulnerability scan
+
+GOVULNCHECK_BIN=${UTILITY_BIN_PATH}/govulncheck
+GOVULNCHECK_VERSION?=latest
+
+${GOVULNCHECK_BIN}: ${UTILITY_BIN_PATH}
+	$(call go-get-tool,$(GOVULNCHECK_BIN),golang.org/x/vuln/cmd/govulncheck@$(GOVULNCHECK_VERSION))
+
+.PHONY: govulncheck
+govulncheck: ${GOVULNCHECK_BIN} ## This target is used to scan the go repository against known vulnerabilities
+	@echo "Start vulnerability against repository"
+	${GOVULNCHECK_BIN} -show verbose ./...
+	@echo "Finished scan"

dogu.json

@@ -1,6 +1,6 @@
 {
   "Name": "official/postgresql",
-  "Version": "14.12-1",
+  "Version": "14.12-2",
   "DisplayName": "PostgreSQL",
   "Description": "PostgreSQL Database.",
   "Url": "https://www.postgresql.org/",
@@ -18,6 +18,13 @@
       "Owner": "1000",
       "Group": "1000",
       "NeedsBackup": true
+    },
+    {
+      "Name": "localConfig",
+      "Path": "/var/ces/config",
+      "Owner": "1000",
+      "Group": "1000",
+      "NeedsBackup": true
     }
   ],
   "ExposedCommands": [