diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 598c152b5f26ded090fa6734760b35056aa93568..b8199779c8174bb77ac8e2ca288ee65d077ac2e9 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.1.1
+current_version = 1.2.0
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
diff --git a/cache/Dockerfile b/cache/Dockerfile
index 2732e29bb5526060ff442efd93d9f0338353e9bd..4926ee94123b92e80b0f8adb5c792102a800223a 100644
--- a/cache/Dockerfile
+++ b/cache/Dockerfile
@@ -31,7 +31,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server cache" \
- version="1.1.1"
+ version="1.2.0"
USER root
ADD install.sh \
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index b7b14b8b137d7d9ac7da7a7b5c19f63a357ffeaf..d49a93465149069dff7fe60c6ff4b587b896fe91 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -11,7 +11,7 @@ version: 0.3.15
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
-appVersion: 1.1.1
+appVersion: 1.2.0
maintainers:
- name: EOX IT Services GmbH
diff --git a/chart/values.yaml b/chart/values.yaml
index d545b7088206548b7004cf024bf6b92c9379ea68..eb4579f54a5a9bbb9796e65e13ddb29e5f2d5047 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -348,7 +348,7 @@ replicaCount: 1
image:
repository: registry.gitlab.eox.at/esa/prism/vs
pullPolicy: IfNotPresent
- tag: "release-1.1.1"
+ tag: "release-1.2.0"
imagePullSecrets: []
nameOverride: ""
diff --git a/client/Dockerfile b/client/Dockerfile
index e2e892b73dca83d1f0dba3d3bd9690b331a03afc..b81861096975a7cfa9651ab0b8222d2ef526e3bc 100644
--- a/client/Dockerfile
+++ b/client/Dockerfile
@@ -31,6 +31,6 @@ LABEL name="prism view server client" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server client" \
- version="1.1.1"
+ version="1.2.0"
COPY html/ /usr/share/nginx/html/
diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html
index 050af17399c7140258465be8e0c554ca9e358026..978b9de23bcd51bf240ce1a2683afad3c80672c2 100644
--- a/config/dem_index-ops.html
+++ b/config/dem_index-ops.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8">
- <meta name="application" content="VS Client release-1.1.1">
+ <meta name="application" content="VS Client release-1.2.0">
<title>PRISM View Server</title>
<link rel="icon" href="//eox.at/favicon.ico" type="image/x-icon">
<link rel="icon" sizes="16x16" href="//eox.at/favicon-16x16.png" type="image/png">
diff --git a/config/emg_index-ops.html b/config/emg_index-ops.html
index af194b49f8a16c717f8f3acb6e292965bb1a0ed0..27b60bbd01124dfc6e478398a80f89a272cbc0da 100644
--- a/config/emg_index-ops.html
+++ b/config/emg_index-ops.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8">
- <meta name="application" content="VS Client release-1.1.1">
+ <meta name="application" content="VS Client release-1.2.0">
<title>PRISM View Server</title>
<link rel="icon" href="//eox.at/favicon.ico" type="image/x-icon">
<link rel="icon" sizes="16x16" href="//eox.at/favicon-16x16.png" type="image/png">
diff --git a/config/vhr18_index-ops.html b/config/vhr18_index-ops.html
index a0b625385dbedf95d618471081c15fd4cacb6a4b..8fb97758bb6d95e15666acf9c9af6269e837be7b 100644
--- a/config/vhr18_index-ops.html
+++ b/config/vhr18_index-ops.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8">
- <meta name="application" content="VS Client release-1.1.1">
+ <meta name="application" content="VS Client release-1.2.0">
<title>PRISM View Server</title>
<link rel="icon" href="//eox.at/favicon.ico" type="image/x-icon">
<link rel="icon" sizes="16x16" href="//eox.at/favicon-16x16.png" type="image/png">
diff --git a/core/Dockerfile b/core/Dockerfile
index 8f590995ad68e764d088c85a138100795f5f7fe5..230c5540818cec92bc0ee304c4782fad9137056a 100644
--- a/core/Dockerfile
+++ b/core/Dockerfile
@@ -31,7 +31,7 @@ LABEL name="prism view server core" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server core" \
- version="1.1.1"
+ version="1.2.0"
USER root
diff --git a/core/setup.py b/core/setup.py
index ab290d8695d69848caaff52e16d888abfe8e0dd0..d44b614a8271cbbbf2ea311790437d146d4bead4 100644
--- a/core/setup.py
+++ b/core/setup.py
@@ -6,7 +6,7 @@ long_description = ""
setup(
name="registrar", # Replace with your own username
- version="1.1.1",
+ version="1.2.0",
author="",
author_email="",
description="registrar for PVS",
diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml
index 8c585e0b1d929b10aa704e3870619cda5b8c0065..3476c5a42024feffdc2241a9ff81d23a0bdb3465 100644
--- a/docker-compose.base.ops.yml
+++ b/docker-compose.base.ops.yml
@@ -1,5 +1,5 @@
version: "3.6"
-x-vs-version: :release-1.1.1 # bumpversion
+x-vs-version: :release-1.2.0 # bumpversion
services:
reverse-proxy:
image: traefik:2.4
diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml
index e69764d1d9bdb45daa8a7f542f644b9fd46fb613..b70295ba130ec185c5c7a7720a943c124f011551 100644
--- a/docker-compose.dem.ops.yml
+++ b/docker-compose.dem.ops.yml
@@ -1,5 +1,5 @@
version: "3.6"
-x-vs-version: :release-1.1.1 # bumpversion
+x-vs-version: :release-1.2.0 # bumpversion
services:
database:
volumes:
@@ -8,7 +8,7 @@ services:
tmpfs:
size: 536870912
renderer:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.2.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -40,7 +40,7 @@ services:
networks:
- extnet
cache:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.2.0 # bumpversion
configs:
- source: mapcache-ops
target: /mapcache-template.xml
@@ -73,7 +73,7 @@ services:
networks:
- extnet
registrar:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.2.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -83,19 +83,19 @@ services:
constraints:
- node.labels.type == internal
ingestor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.2.0 # bumpversion
environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
deploy:
placement:
constraints: [node.role == manager]
sftp:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.2.0 # bumpversion
deploy:
placement:
constraints: [node.role == manager]
client:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.2.0 # bumpversion
configs:
- source: client-ops
target: /usr/share/nginx/html/index.html
@@ -123,7 +123,7 @@ services:
networks:
- extnet
preprocessor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.2.0 # bumpversion
volumes:
- type: bind
source: /var/vhr
diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml
index f2e5be60773656f097177c4da98c9895927aebd3..8496dfec0164859474f3f527cbb999f5ef2f2c47 100644
--- a/docker-compose.emg.ops.yml
+++ b/docker-compose.emg.ops.yml
@@ -1,5 +1,5 @@
version: "3.6"
-x-vs-version: :release-1.1.1 # bumpversion
+x-vs-version: :release-1.2.0 # bumpversion
services:
database:
volumes:
@@ -8,7 +8,7 @@ services:
tmpfs:
size: 536870912
renderer:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.2.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -63,7 +63,7 @@ services:
networks:
- extnet
cache:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.2.0 # bumpversion
configs:
- source: mapcache-ops
target: /mapcache-template.xml
@@ -121,7 +121,7 @@ services:
networks:
- extnet
registrar:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.2.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -131,19 +131,19 @@ services:
constraints:
- node.labels.type == internal
ingestor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.2.0 # bumpversion
environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
deploy:
placement:
constraints: [node.role == manager]
sftp:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.2.0 # bumpversion
deploy:
placement:
constraints: [node.role == manager]
client:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.2.0 # bumpversion
configs:
- source: client-ops
target: /usr/share/nginx/html/index.html
@@ -182,7 +182,7 @@ services:
networks:
- extnet
preprocessor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.2.0 # bumpversion
volumes:
- type: bind
source: /var/vhr
@@ -193,7 +193,7 @@ services:
constraints:
- node.labels.type == internal
shibauth-emg:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_shibauth:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_shibauth:release-1.2.0 # bumpversion
environment:
APACHE_SERVERNAME: "https://emg.pass.copernicus.eu:443"
PROXY_USER_CATEGORY_ALLOW_RENDERER: "(Copernicus_Services|Union_Inst|Union_Research_Projects_space|Union_Research_Projects_non-space|Public_Auth)"
diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml
index 63e02e907e0da157e256d23f3b37a923e0c85e38..17211b75db9ea076a67d3bdada4f0568f6f564fa 100644
--- a/docker-compose.logging.ops.yml
+++ b/docker-compose.logging.ops.yml
@@ -1,8 +1,8 @@
version: "3.6"
-x-vs-version: :release-1.1.1 # bumpversion
+x-vs-version: :release-1.2.0 # bumpversion
services:
fluentd:
- image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.2.0 # bumpversion
deploy:
placement:
# this is not strictly required, but feels right
diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml
index 580d9ade68514ecc8b8618eb933f15eff1555eb9..1675eee88780593391e5a376eeca0ea5f154077c 100644
--- a/docker-compose.vhr18.ops.yml
+++ b/docker-compose.vhr18.ops.yml
@@ -1,5 +1,5 @@
version: "3.6"
-x-vs-version: :release-1.1.1 # bumpversion
+x-vs-version: :release-1.2.0 # bumpversion
services:
database:
volumes:
@@ -8,7 +8,7 @@ services:
tmpfs:
size: 536870912
renderer:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.2.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -40,7 +40,7 @@ services:
networks:
- extnet
cache:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.2.0 # bumpversion
configs:
- source: mapcache-ops
target: /mapcache-template.xml
@@ -73,7 +73,7 @@ services:
networks:
- extnet
registrar:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.2.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -83,19 +83,19 @@ services:
constraints:
- node.labels.type == internal
ingestor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.2.0 # bumpversion
environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
deploy:
placement:
constraints: [node.role == manager]
sftp:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.2.0 # bumpversion
deploy:
placement:
constraints: [node.role == manager]
client:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.2.0 # bumpversion
configs:
- source: client-ops
target: /usr/share/nginx/html/index.html
@@ -123,7 +123,7 @@ services:
networks:
- extnet
preprocessor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.1 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.2.0 # bumpversion
volumes:
- type: bind
source: /var/vhr
diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile
index 690f55dc8f008a01876ea003379374d10d871277..5236686c829d1bb2ad3d2a68f491a36a774f5fee 100644
--- a/fluentd/Dockerfile
+++ b/fluentd/Dockerfile
@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server fluentd" \
- version="1.1.1"
+ version="1.2.0"
USER root
RUN gem install fluent-plugin-elasticsearch \
diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile
index fbe4a1b270cb98f853d0ebbc9dba98a4481ee07c..56d7fd29a3b5f3e6fc8bba7bc1e9ee010d0f00ca 100644
--- a/ingestor/Dockerfile
+++ b/ingestor/Dockerfile
@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
type="prism view server ingestor" \
- version="1.1.1"
+ version="1.2.0"
USER root
ADD install.sh requirements.txt \
diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile
index 11268c4b891ca84704775e54e1571d831e9b0f0d..24180ff86a78a13e008f33ac9a40425cae5f1643 100644
--- a/preprocessor/Dockerfile
+++ b/preprocessor/Dockerfile
@@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server preprocessor" \
- version="1.1.1"
+ version="1.2.0"
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
diff --git a/preprocessor/setup.py b/preprocessor/setup.py
index 0e167f2684e3e30f9695b2b543311ff60043ffe7..3cfacbaeea4ca21a830c53ff218938aa8e9cdcb8 100644
--- a/preprocessor/setup.py
+++ b/preprocessor/setup.py
@@ -6,7 +6,7 @@ long_description = ""
setup(
name="preprocessor", # Replace with your own username
- version="1.1.1",
+ version="1.2.0",
author="",
author_email="",
description="preprocessor for PVS",
diff --git a/sftp/Dockerfile b/sftp/Dockerfile
index e3ef48e468089679a89eacd66c48088570f88255..13781a7428eec848229cb0409805ed60fa456d63 100644
--- a/sftp/Dockerfile
+++ b/sftp/Dockerfile
@@ -31,7 +31,7 @@ LABEL name="prism view server docker base image" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
type="prism view server docker base image" \
- version="1.1.1"
+ version="1.2.0"
RUN mkdir /etc/sftp.d
diff --git a/shibauth/Dockerfile b/shibauth/Dockerfile
index 1aa9cffff1c32e21685993d42afa7728db49c15d..3123e4c43947c5c5e78cb360afaa74acd4fc0ce3 100644
--- a/shibauth/Dockerfile
+++ b/shibauth/Dockerfile
@@ -31,7 +31,7 @@ LABEL name="prism view server shibauth" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
type="prism view server shibauth" \
- version="1.1.1"
+ version="1.2.0"
RUN yum -y update \
&& yum -y install shibboleth-3.2.0-2.1 \
diff --git a/testing/Dockerfile b/testing/Dockerfile
index e1da6626ec4a694426c1dc82153f6b0209aba045..1f3232471b2c6a93330adf4f3d774213fb95862d 100644
--- a/testing/Dockerfile
+++ b/testing/Dockerfile
@@ -30,7 +30,7 @@ LABEL name="prism view server docker base image" \
vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
type="prism view server docker base image" \
- version="1.1.1"
+ version="1.2.0"
FROM docker:19.03.13-dind