Skip to content

Commit b6db19c

Browse files
nfranzeckcesmarvin
nfranzeck
authored and
cesmarvin
committed
Merge branch 'release/v1.29.4-4'
2 parents 831916d + 5330338 commit b6db19c

17 files changed

Lines changed: 132 additions & 50 deletions

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [v1.29.4-4] - 2026-02-13
11+
### Security
12+
- [#138] fixed [CVE-2025-68121](https://avd.aquasec.com/nvd/2025/cve-2025-68121/)
13+
1014
## [v1.29.4-3] - 2026-01-29
1115

1216
### Security

‎Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM node:lts-alpine as templating
22

33
ENV WORKDIR=/template \
44
# Used in template to invalidate caches - do not remove. The release script will auto update this line
5-
VERSION="1.29.4-3"
5+
VERSION="1.29.4-4"
66

77
RUN mkdir -p ${WORKDIR}
88
WORKDIR ${WORKDIR}
@@ -14,14 +14,14 @@ RUN yarn install
1414
RUN node template-colors.js ${WORKDIR}/resources/var/www/html/styles/default.css.tpl ${WORKDIR}/build/default.css
1515
RUN node template-error-pages.js ${WORKDIR}/resources/var/www/html/errors/error-page.html.tpl ${WORKDIR}/build/errors
1616

17-
FROM registry.cloudogu.com/official/base:3.22.0-5 as builder
17+
FROM registry.cloudogu.com/official/base:3.23.3-3 as builder
1818
LABEL maintainer="hello@cloudogu.com"
1919

2020
# dockerfile is based on https://github.com/dockerfile/nginx and https://github.com/bellycard/docker-loadbalancer
2121
ENV NGINX_VERSION=1.29.4 \
2222
NGINX_TAR_SHA256="5a7d37eee505866fbab5810fa9f78247d6d5d9157a595c4e7a72043141ddab25" \
23-
CES_CONFD_VERSION=0.11.0 \
24-
CES_CONFD_TAR_SHA256="85809a3e9e0b56d58c53f958872809eab1026124a73a06eedfcdeba9ca73ec9a" \
23+
CES_CONFD_VERSION=0.12.0 \
24+
CES_CONFD_TAR_SHA256="fb5ddd8aab1893d92c525b906e1a027b602b51cdf58fec0aff55f72c8a729b1a" \
2525
WARP_MENU_VERSION=2.0.3 \
2626
WARP_MENU_ZIP_SHA256="8dfd023579728b6786bdb4664fb6d3e629717d9d2d27cdd4b365f9a844f1858c" \
2727
CES_ABOUT_VERSION="0.7.0" \
@@ -65,14 +65,14 @@ RUN wget --progress=bar:force:noscroll -O /tmp/warp.zip https://github.com/cloud
6565
&& echo "${WARP_MENU_ZIP_SHA256} */tmp/warp.zip" | sha256sum -c - \
6666
&& unzip /tmp/warp.zip -d /build/var/www/html
6767

68-
FROM registry.cloudogu.com/official/base:3.22.0-5
68+
FROM registry.cloudogu.com/official/base:3.23.3-3
6969
LABEL maintainer="hello@cloudogu.com" \
7070
NAME="official/nginx" \
71-
VERSION="1.29.4-3"
71+
VERSION="1.29.4-4"
7272

7373
ENV CES_MAINTENANCE_MODE=false \
7474
# Used in template to invalidate caches - do not remove. The release script will auto update this line
75-
VERSION="1.29.4-3"
75+
VERSION="1.29.4-4"
7676

7777
RUN set -x -o errexit \
7878
&& set -o nounset \

‎Jenkinsfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ def pipe = new com.cloudogu.sos.pipebuildlib.DoguPipe(this, [
1212
''',
1313
checkMarkdown : true,
1414
cypressImage : 'cypress/included:13.14.0',
15+
defaultBranch : "master",
1516
runIntegrationTests : true,
1617
dependedDogus : ['cas']
1718

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
MAKEFILES_VERSION=10.1.1
1+
MAKEFILES_VERSION=10.6.0
22

33
.DEFAULT_GOAL:=dogu-release
44

@@ -7,6 +7,7 @@ include build/make/self-update.mk
77
include build/make/release.mk
88
include build/make/prerelease.mk
99
include build/make/version-sha.mk
10+
include build/make/trivyscan.mk
1011

1112
NGINX_VERSION=$(shell grep NGINX_VERSION= Dockerfile | sed 's/.*NGINX_VERSION=\([^ ]*\).*/\1/g')
1213
CES_CONFD_VERSION=$(shell grep CES_CONFD_VERSION= Dockerfile | sed 's/.*CES_CONFD_VERSION=\([^ ]*\).*/\1/g')

‎build/make/bats.mk‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BATS_SUPPORT=$(BATS_LIBRARY_DIR)/bats-support
99
BATS_FILE=$(BATS_LIBRARY_DIR)/bats-file
1010
BATS_BASE_IMAGE?=bats/bats
1111
BATS_CUSTOM_IMAGE?=cloudogu/bats
12-
BATS_TAG?=1.11.0
12+
BATS_TAG?=1.12.0
1313
BATS_DIR=build/make/bats
1414
BATS_WORKDIR="${WORKDIR}"/"${BATS_DIR}"
1515

@@ -18,15 +18,19 @@ unit-test-shell: unit-test-shell-$(ENVIRONMENT)
1818

1919
$(BATS_ASSERT):
2020
@git clone --depth 1 https://github.com/bats-core/bats-assert $@
21+
@rm -rf $@/.git
2122

2223
$(BATS_MOCK):
2324
@git clone --depth 1 https://github.com/grayhemp/bats-mock $@
25+
@rm -rf $@/.git
2426

2527
$(BATS_SUPPORT):
2628
@git clone --depth 1 https://github.com/bats-core/bats-support $@
29+
@rm -rf $@/.git
2730

2831
$(BATS_FILE):
2932
@git clone --depth 1 https://github.com/bats-core/bats-file $@
33+
@rm -rf $@/.git
3034

3135
$(BASH_SRC):
3236
BASH_SRC:=$(shell find "${WORKDIR}" -type f -name "*.sh")
@@ -49,10 +53,10 @@ unit-test-shell-local: $(BASH_SRC) $(PASSWD) $(ETCGROUP) $(HOME_DIR) buildTestIm
4953
"${BATS_DIR}"/customBatsEntrypoint.sh make unit-test-shell-generic-no-junit
5054

5155
unit-test-shell-generic:
52-
@bats --formatter junit --output ${BASH_TEST_REPORT_DIR} ${TESTS_DIR}
56+
@bats --report-formatter junit --formatter junit --output ${BASH_TEST_REPORT_DIR} ${TESTS_DIR}
5357

5458
unit-test-shell-generic-no-junit:
55-
@bats ${TESTS_DIR}
59+
@bats --report-formatter junit --output ${BASH_TEST_REPORT_DIR} ${TESTS_DIR}
5660

5761
.PHONY buildTestImage:
5862
buildTestImage:

‎build/make/bats/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ARG BATS_BASE_IMAGE
22
ARG BATS_TAG
33

4-
FROM ${BATS_BASE_IMAGE:-bats/bats}:${BATS_TAG:-1.11.0}
4+
FROM ${BATS_BASE_IMAGE:-bats/bats}:${BATS_TAG:-1.12.0}
55

66
# Make bash more findable by scripts and tests
77
RUN apk add make git bash

‎build/make/bats/customBatsEntrypoint.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@ set -o errexit
33
set -o nounset
44
set -o pipefail
55

6-
"$@"
6+
targetReportDir="${PWD}"/target/shell_test_reports
7+
uidgid=1000:1000
8+
exitcode=0
9+
"$@" || exitcode=$?
10+
echo "Resetting file ownership to ${uidgid} in ${targetReportDir}/"
11+
chown -R ${uidgid} "${targetReportDir}"/*
12+
echo "exiting with code ${exitcode}"
13+
exit ${exitcode}

‎build/make/build.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
ADDITIONAL_LDFLAGS?=-extldflags -static
44
LDFLAGS?=-ldflags "$(ADDITIONAL_LDFLAGS) -X main.Version=$(VERSION) -X main.CommitID=$(COMMIT_ID)"
55
GOIMAGE?=golang
6-
GOTAG?=1.24
6+
GOTAG?=1.25
77
GOOS?=linux
88
GOARCH?=amd64
99
PRE_COMPILE?=

‎build/make/k8s-component.mk‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
COMPONENT_DEV_VERSION?=${VERSION}-dev
1+
COMPONENT_BUILD_VERSION := $(shell date +%s)
2+
COMPONENT_DEV_VERSION?=${VERSION}-dev.${COMPONENT_BUILD_VERSION}
23

34
include ${BUILD_DIR}/make/k8s.mk
45

@@ -15,8 +16,9 @@ HELM_RELEASE_TGZ=${HELM_TARGET_DIR}/${ARTIFACT_ID}-${VERSION}.tgz
1516
HELM_DEV_RELEASE_TGZ=${HELM_TARGET_DIR}/${ARTIFACT_ID}-${COMPONENT_DEV_VERSION}.tgz
1617
HELM_ARTIFACT_NAMESPACE?=k8s
1718
ifeq (${RUNTIME_ENV}, remote)
18-
HELM_ARTIFACT_NAMESPACE?=testing/k8s
19+
HELM_ARTIFACT_NAMESPACE=testing/k8s
1920
endif
21+
$(info HELM_ARTIFACT_NAMESPACE=$(HELM_ARTIFACT_NAMESPACE))
2022

2123
K8S_RESOURCE_COMPONENT ?= "${K8S_RESOURCE_TEMP_FOLDER}/component-${ARTIFACT_ID}-${VERSION}.yaml"
2224
K8S_RESOURCE_COMPONENT_CR_TEMPLATE_YAML ?= $(BUILD_DIR)/make/k8s-component.tpl
@@ -93,10 +95,10 @@ helm-reinstall: helm-delete helm-apply ## Uninstalls the current helm chart and
9395
.PHONY: helm-chart-import
9496
helm-chart-import: ${CHECK_VAR_TARGETS} helm-generate helm-package ${IMAGE_IMPORT_TARGET} ## Imports the currently available chart into the cluster-local registry.
9597
@if [[ ${STAGE} == "development" ]]; then \
96-
echo "Import ${HELM_DEV_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}..."; \
98+
echo "Import ${HELM_DEV_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE}..."; \
9799
${BINARY_HELM} push ${HELM_DEV_RELEASE_TGZ} oci://${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE} ${BINARY_HELM_ADDITIONAL_PUSH_ARGS}; \
98100
else \
99-
echo "Import ${HELM_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}..."; \
101+
echo "Import ${HELM_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE}..."; \
100102
${BINARY_HELM} push ${HELM_RELEASE_TGZ} oci://${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE} ${BINARY_HELM_ADDITIONAL_PUSH_ARGS}; \
101103
fi
102104
@echo "Done."
@@ -142,7 +144,7 @@ ${K8S_RESOURCE_COMPONENT_CR_TEMPLATE_YAML}: ${K8S_RESOURCE_TEMP_FOLDER}
142144
fi
143145

144146
.PHONY: component-apply
145-
component-apply: isLocal check-k8s-namespace-env-var ${COMPONENT_PRE_APPLY_TARGETS} ${IMAGE_IMPORT_TARGET} helm-generate helm-chart-import component-generate ## Applies the component yaml resource to the actual defined context.
147+
component-apply: isProduction check-k8s-namespace-env-var ${COMPONENT_PRE_APPLY_TARGETS} ${IMAGE_IMPORT_TARGET} helm-generate helm-chart-import component-generate ## Applies the component yaml resource to the actual defined context.
146148
@kubectl apply -f "${K8S_RESOURCE_COMPONENT}" --namespace="${NAMESPACE}" --context="${KUBE_CONTEXT_NAME}"
147149
@echo "Done."
148150

‎build/make/k8s-crd.mk‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ ifeq ($(APPEND_CRD_SUFFIX), true)
55
else ifeq ($(APPEND_CRD_SUFFIX), false)
66
ARTIFACT_CRD_ID = $(ARTIFACT_ID)
77
endif
8-
DEV_CRD_VERSION ?= ${VERSION}-dev
8+
CRD_BUILD_VERSION := $(shell date +%s).$(TIMESTAMP)
9+
DEV_CRD_VERSION ?= ${VERSION}-dev.${COMPONENT_BUILD_VERSION}
910
HELM_CRD_SOURCE_DIR ?= ${WORKDIR}/k8s/helm-crd
1011
HELM_CRD_TARGET_DIR ?= $(K8S_RESOURCE_TEMP_FOLDER)/helm-crd
1112
HELM_CRD_RELEASE_TGZ = ${HELM_CRD_TARGET_DIR}/${ARTIFACT_CRD_ID}-${VERSION}.tgz
@@ -89,10 +90,10 @@ ${HELM_CRD_RELEASE_TGZ}: ${BINARY_HELM} crd-helm-generate ## Generates and packa
8990
.PHONY: crd-helm-chart-import
9091
crd-helm-chart-import: ${CHECK_VAR_TARGETS} check-k8s-artifact-id crd-helm-generate crd-helm-package ## Imports the currently available Helm CRD chart into the cluster-local registry.
9192
@if [[ ${STAGE} == "development" ]]; then \
92-
echo "Import ${HELM_CRD_DEV_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}..."; \
93+
echo "Import ${HELM_CRD_DEV_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE}..."; \
9394
${BINARY_HELM} push ${HELM_CRD_DEV_RELEASE_TGZ} oci://${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE} ${BINARY_HELM_ADDITIONAL_PUSH_ARGS}; \
9495
else \
95-
echo "Import ${HELM_CRD_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}..."; \
96+
echo "Import ${HELM_CRD_RELEASE_TGZ} into K8s cluster ${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE}..."; \
9697
${BINARY_HELM} push ${HELM_CRD_RELEASE_TGZ} oci://${CES_REGISTRY_HOST}/${HELM_ARTIFACT_NAMESPACE} ${BINARY_HELM_ADDITIONAL_PUSH_ARGS}; \
9798
fi
9899
@echo "Done."
@@ -111,7 +112,7 @@ crd-component-generate: ${K8S_RESOURCE_TEMP_FOLDER} ## Generate the CRD componen
111112
fi
112113

113114
.PHONY: crd-component-apply
114-
crd-component-apply: isLocal check-k8s-namespace-env-var crd-helm-chart-import crd-component-generate ## Applies the CRD component YAML resource to the actual defined context.
115+
crd-component-apply: isProduction check-k8s-namespace-env-var crd-helm-chart-import crd-component-generate ## Applies the CRD component YAML resource to the actual defined context.
115116
@kubectl apply -f "${K8S_RESOURCE_CRD_COMPONENT}" --namespace="${NAMESPACE}" --context="${KUBE_CONTEXT_NAME}"
116117
@echo "Done."
117118

0 commit comments

Comments
 (0)