From 89fffe1031c5108ab8b97742081748770e541a24 Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Thu, 12 Nov 2020 21:11:37 +0100
Subject: [PATCH] =?UTF-8?q?Bump=20version:=201.0.0-rc.2=20=E2=86=92=201.0.?=
=?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.bumpversion.cfg | 2 +-
cache/Dockerfile | 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 +-
docker-compose.base.ops.yml | 2 +-
docker-compose.dem.ops.yml | 14 +++++++-------
docker-compose.emg.ops.yml | 14 +++++++-------
docker-compose.logging.ops.yml | 4 ++--
docker-compose.vhr18.ops.yml | 14 +++++++-------
fluentd/Dockerfile | 2 +-
ingestor/Dockerfile | 2 +-
preprocessor/Dockerfile | 2 +-
preprocessor/setup.py | 2 +-
testing/Dockerfile | 2 +-
17 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d66c0ff4..23118d87 100644
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 1.0.0-rc.2
+current_version = 1.0.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 57abc976..2a4a3648 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.0.0-rc.2"
+ version="1.0.0"
USER root
ADD install.sh \
diff --git a/client/Dockerfile b/client/Dockerfile
index 2255e745..ff1e60a2 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.0.0-rc.2"
+ version="1.0.0"
COPY html/ /usr/share/nginx/html/
diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html
index 77b34692..dab8c0db 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.0.0-rc.2">
+ <meta name="application" content="VS Client release-1.0.0">
<title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/emg_index-ops.html b/config/emg_index-ops.html
index 171adcd8..fa51d00a 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.0.0-rc.2">
+ <meta name="application" content="VS Client release-1.0.0">
<title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/config/vhr18_index-ops.html b/config/vhr18_index-ops.html
index 7000f3f1..d5cb160b 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.0.0-rc.2">
+ <meta name="application" content="VS Client release-1.0.0">
<title>PRISM View Server</title>
<link rel="icon" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-192x192.png" sizes="192x192" />
<link rel="apple-touch-icon-precomposed" href="//eox.at/wp-content/uploads/2015/06/cropped-eox_eye-180x180.png" />
diff --git a/core/Dockerfile b/core/Dockerfile
index 70fb15f1..eba367f4 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.0.0-rc.2"
+ version="1.0.0"
USER root
diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml
index 7b31c830..4169bb78 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.0.0-rc.2 # bumpversion
+x-vs-version: :release-1.0.0 # bumpversion
services:
reverse-proxy:
image: traefik:2.1
diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml
index 5184b39d..5ad58655 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.0.0-rc.2 # bumpversion
+x-vs-version: :release-1.0.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.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -60,7 +60,7 @@ services:
networks:
- extnet
cache:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0 # bumpversion
configs:
- source: mapcache-ops
target: /mapcache-template.xml
@@ -113,7 +113,7 @@ services:
networks:
- extnet
registrar:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -123,7 +123,7 @@ services:
constraints:
- node.labels.type == internal
client:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0 # bumpversion
configs:
- source: client-ops
target: /usr/share/nginx/html/index.html
@@ -161,7 +161,7 @@ services:
networks:
- extnet
preprocessor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0 # bumpversion
volumes:
- type: bind
source: /var/vhr
@@ -226,7 +226,7 @@ services:
- source: native-logger
target: /etc/shibboleth/native.logger
ingestor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0 # bumpversion
networks:
extnet:
name: dem-extnet
diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml
index 4f4d5cd0..81d0c154 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.0.0-rc.2 # bumpversion
+x-vs-version: :release-1.0.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.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -60,7 +60,7 @@ services:
networks:
- extnet
cache:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0 # bumpversion
configs:
- source: mapcache-ops
target: /mapcache-template.xml
@@ -113,7 +113,7 @@ services:
networks:
- extnet
registrar:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -123,7 +123,7 @@ services:
constraints:
- node.labels.type == internal
client:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0 # bumpversion
configs:
- source: client-ops
target: /usr/share/nginx/html/index.html
@@ -161,7 +161,7 @@ services:
networks:
- extnet
preprocessor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0 # bumpversion
volumes:
- type: bind
source: /var/vhr
@@ -226,7 +226,7 @@ services:
- source: native-logger
target: /etc/shibboleth/native.logger
ingestor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0 # bumpversion
networks:
extnet:
name: emg-extnet
diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml
index 2a6437f7..16c97014 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.0.0-rc.2 # bumpversion
+x-vs-version: :release-1.0.0 # bumpversion
services:
fluentd:
- image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.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 c0baef92..434dc86e 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.0.0-rc.2 # bumpversion
+x-vs-version: :release-1.0.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.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -60,7 +60,7 @@ services:
networks:
- extnet
cache:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.0.0 # bumpversion
configs:
- source: mapcache-ops
target: /mapcache-template.xml
@@ -113,7 +113,7 @@ services:
networks:
- extnet
registrar:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.0.0 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
@@ -123,7 +123,7 @@ services:
constraints:
- node.labels.type == internal
client:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0 # bumpversion
configs:
- source: client-ops
target: /usr/share/nginx/html/index.html
@@ -161,7 +161,7 @@ services:
networks:
- extnet
preprocessor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.0.0 # bumpversion
volumes:
- type: bind
source: /var/vhr
@@ -226,7 +226,7 @@ services:
- source: native-logger
target: /etc/shibboleth/native.logger
ingestor:
- image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0-rc.2 # bumpversion
+ image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.0.0 # bumpversion
networks:
extnet:
name: vhr18-extnet
diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile
index 0bc13cb9..16e39bc3 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.0.0-rc.2"
+ version="1.0.0"
USER root
RUN gem install fluent-plugin-elasticsearch \
diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile
index e1b80dcf..53f44dcc 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.0.0-rc.2"
+ version="1.0.0"
USER root
ADD install.sh requirements.txt \
diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile
index 987d52b4..756dbbb4 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.0.0-rc.2"
+ version="1.0.0"
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
diff --git a/preprocessor/setup.py b/preprocessor/setup.py
index 34c7a2e8..b42a5859 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.0.0-rc.2",
+ version="1.0.0",
author="",
author_email="",
description="preprocessor for PVS",
diff --git a/testing/Dockerfile b/testing/Dockerfile
index 3361d6fa..97b24430 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.0.0-rc.2"
+ version="1.0.0"
FROM docker:19.03.13-dind
--
GitLab