Merge branch 'release/v1.7.3-4'

.env.template

@@ -0,0 +1,4 @@
+NAMESPACE=ecosystem
+
+# Use this to deploy to remote k8s-clusters
+# RUNTIME_ENV=remote

.gitignore

@@ -113,3 +113,6 @@ Temporary Items
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+.env
+.bin/

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v1.7.3-4] - 2024-09-25
+### Changed
+- Switch to new CAS service account structure in dogu.json
+
 ## [v1.7.3-3] - 2024-09-18
 ### Changed
 - Relicense to AGPL-3.0-only

Dockerfile

@@ -16,9 +16,9 @@ RUN set -x \
 
 
 
-FROM registry.cloudogu.com/official/java:21.0.4-1
+FROM registry.cloudogu.com/official/java:21.0.4-3
 LABEL NAME="official/smeagol" \
-      VERSION="1.7.3-3" \
+      VERSION="1.7.3-4" \
       maintainer="[email protected]"
 
 ENV SERVICE_TAGS=webapp \

Makefile

@@ -1,8 +1,9 @@
-MAKEFILES_VERSION=9.1.0
+MAKEFILES_VERSION=9.2.1
 
 .DEFAULT_GOAL:=dogu-release
 
 include build/make/variables.mk
 include build/make/self-update.mk
 include build/make/release.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/k8s.mk

@@ -138,7 +138,7 @@ ${K8S_RESOURCE_TEMP_FOLDER}:
 ##@ K8s - Docker
 
 .PHONY: docker-build
-docker-build: check-docker-credentials check-k8s-image-env-var ## Builds the docker image of the K8s app.
+docker-build: check-docker-credentials check-k8s-image-env-var ${BINARY_YQ} ## Builds the docker image of the K8s app.
 	@echo "Building docker image $(IMAGE)..."
 	@DOCKER_BUILDKIT=1 docker build . -t $(IMAGE)
 

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/smeagol",
-  "Version": "1.7.3-3",
+  "Version": "1.7.3-4",
   "DisplayName": "Smeagol",
   "Description": "Store your technical documentation with in your git repositories",
   "Category": "Development Apps",
@@ -16,7 +16,8 @@
   "Dependencies": [
     {
       "type": "dogu",
-      "name": "cas"
+      "name": "cas",
+      "Version": ">=7.0.5.1-6"
     },
     {
       "type": "dogu",
@@ -28,6 +29,14 @@
       "version": ">=2.20.0-1"
     }
   ],
+  "ServiceAccounts": [
+    {
+      "Type": "cas",
+      "Params": [
+        "cas"
+      ]
+    }
+  ],
   "Configuration": [
     {
       "Name": "logging/root",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smeagol",
-  "version": "1.7.3-3",
+  "version": "1.7.3-4",
   "private": true,
   "license": "AGPL-3.0-only",
   "dependencies": {

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>com.cloudogu.wiki</groupId>
     <artifactId>smeagol</artifactId>
-    <version>1.7.3-3</version>
+    <version>1.7.3-4</version>
     <name>smeagol</name>
     <packaging>war</packaging>