EOX GitLab Instance

Commit c99fa508 authored by Fabian Schindler's avatar Fabian Schindler
Browse files

Merge branch 'main' into 'http-access-opensearch'

# Conflicts:
#   Dockerfile
parents 6859aac3 ecf59c93
Pipeline #21542 passed with stage
in 48 seconds
[bumpversion]
current_version = 2.0.34
current_version = 2.0.35
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
......
......@@ -94,4 +94,4 @@ EXPOSE 80
ENTRYPOINT ["./entrypoint.sh"]
CMD ["/opt/core/run-httpd.sh"]
LABEL version="2.0.34"
LABEL version="2.0.35"
......@@ -19,10 +19,10 @@ maintainers:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "2.0.34"
version: "2.0.35"
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "2.0.34"
appVersion: "2.0.35"
......@@ -36,8 +36,8 @@ backends:
- type: eoxserver
path: registrar.backend.eoxserver.EOxServerBackend
kwargs:
instance_base_path: /var/www/pvs/dev
instance_name: pvs_instance
instance_base_path: {{ .Values.config.eoxserverInstanceBasePath }}
instance_name: {{ .Values.config.eoxserverInstanceName }}
product_types:
{{- range $prod_type_val := .Values.global.productTypes -}}
{{- $prod_type_val := unset $prod_type_val "browses" }}
......
......@@ -28,6 +28,8 @@ config:
pathBackends: []
preHandlers: []
postHandlers: []
eoxserverInstanceBasePath: "/var/www/pvs/dev"
eoxserverInstanceName: "pvs_instance"
global:
env:
......
......@@ -19,10 +19,10 @@ maintainers:
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: "2.0.34"
version: "2.0.35"
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "2.0.34"
appVersion: "2.0.35"
......@@ -6,7 +6,7 @@ long_description = ""
setup(
name="registrar", # Replace with your own username
version="2.0.34",
version="2.0.35",
author="",
author_email="",
description="registrar for PVS",
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment