From a41cef3f16a03adb875dc87273a12be91c8d75a3 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Wed, 3 Feb 2021 16:21:27 +0100
Subject: [PATCH] =?UTF-8?q?Bump=20version:=201.1.1=20=E2=86=92=201.2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.bumpversion.cfg | 2 +-
cache/Dockerfile | 2 +-
chart/Chart.yaml | 2 +-
chart/values.yaml | 2 +-
client/Dockerfile | 2 +-
config/dem_index-ops.html | 2 +-
config/emg_index-ops.html | 2 +-
config/vhr18_index-ops.html | 2 +-
core/Dockerfile | 2 +-
core/setup.py | 2 +-
docker-compose.base.ops.yml | 2 +-
docker-compose.dem.ops.yml | 16 ++++++++--------
docker-compose.emg.ops.yml | 18 +++++++++---------
docker-compose.logging.ops.yml | 4 ++--
docker-compose.vhr18.ops.yml | 16 ++++++++--------
fluentd/Dockerfile | 2 +-
ingestor/Dockerfile | 2 +-
preprocessor/Dockerfile | 2 +-
preprocessor/setup.py | 2 +-
sftp/Dockerfile | 2 +-
shibauth/Dockerfile | 2 +-
testing/Dockerfile | 2 +-
22 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index 598c152b..b8199779 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 2732e29b..4926ee94 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 b7b14b8b..d49a9346 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 d545b708..eb4579f5 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 e2e892b7..b8186109 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 050af173..978b9de2 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 af194b49..27b60bbd 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 a0b62538..8fb97758 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 8f590995..230c5540 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 ab290d86..d44b614a 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 8c585e0b..3476c5a4 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 e69764d1..b70295ba 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 f2e5be60..8496dfec 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 63e02e90..17211b75 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 580d9ade..1675eee8 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 690f55dc..5236686c 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 fbe4a1b2..56d7fd29 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 11268c4b..24180ff8 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 0e167f26..3cfacbae 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 e3ef48e4..13781a74 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 1aa9cfff..3123e4c4 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 e1da6626..1f323247 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
--
GitLab