sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-06 15:31:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat(xwiki): Make use of Solr image

Browse Source
This commit is contained in:
Thorsten Roßner
2025-08-20 12:33:04 +02:00
parent 62ba5aba49
commit da4d258d22
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
helmfile/apps/xwiki/values.yaml.gotmpl
View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
# SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
# SPDX-License-Identifier: Apache-2.0
---
@@ -6,15 +6,8 @@ commonAnnotations:
{{ .Values.annotations.xwiki.common | toYaml | nindent 2 }}
image:
{{- if eq .Values.databases.xwiki.type "mariadb" }}
name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiMariadb.registry }}/{{ .Values.images.xwikiMariadb.repository }}"
tag: {{ .Values.images.xwikiMariadb.tag | quote }}
{{- else if eq .Values.databases.xwiki.type "postgresql" }}
name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiPostgres.registry }}/{{ .Values.images.xwikiPostgres.repository }}"
tag: {{ .Values.images.xwikiPostgres.tag | quote }}
{{- else }}
{{- fail "Unsupported value for .Values.databases.xwiki.type, supported values are 'mariadb' or 'postgresql'" }}
{{- end }}
name: "{{ .Values.images.xwiki.registry }}/{{ .Values.images.xwiki.repository }}"
tag: {{ .Values.images.xwiki.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
imagePullSecrets:
{{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}

22
helmfile/environments/default/images.yaml.gotmpl
View File

@@ -997,24 +997,12 @@ images:
registry: "registry-1.docker.io"
repository: "library/nginx"
tag: "1.28.0-alpine3.21@sha256:aed99734248e851764f1f2146835ecad42b5f994081fa6631cc5d79240891ec9"
xwikiMariadb:
xwiki:
# providerCategory: "Supplier"
# providerResponsible: "XWiki"
# upstreamRegistry: "https://git.xwikisas.com:5050"
# upstreamRepository: "xwikisas/swp/xwiki"
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)-mariadb.+$'
# upstreamMirrorStartFrom: ["0", "12"]
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
tag: "0.25-mariadb-jetty-alpine@sha256:7175ef5e454b4eb0f6fd6a92a9503d8a680db3ca97b25c3a4eedac9c9bfbcdaf"
xwikiPostgres:
# providerCategory: "Supplier"
# providerResponsible: "XWiki"
# upstreamRegistry: "https://git.xwikisas.com:5050"
# upstreamRepository: "xwikisas/swp/xwiki"
# upstreamMirrorTagFilterRegEx: '^(\d+)\.(\d+)-postgres.+$'
# upstreamMirrorStartFrom: ["0", "23"]
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/supplier/xwiki/images-mirror/xwiki"
tag: "0.25-postgres-jetty-alpine@sha256:1bfc57a65f8bc6b059d550791699b5afa33b91db8d4c75ca8f6f3d2299f7c335"
# upstreamRepository: "xwikisas/swp/xwiki-solr"
registry: "git.xwikisas.com:5050"
repository: "xwikisas/swp/xwiki-solr"
tag: "1.0.0"
...