diff --git a/.bumpversion.cfg b/.bumpversion.cfg
index d66c0ff477d4cb2ecf23c73ca1ab1f06897e1d75..23118d87d5f29e0fb189e4117e3ff138ccad7d18 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 57abc9760abf48796ffd709995e49f75bec4a02b..2a4a364820c9caedf5c74c0f9772216154fe3a1d 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 2255e745416052b932c5af8c7b6e0375b76773d9..ff1e60a2ed025c828c5652c250eec8c2bcdca3e1 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 77b34692deedd764c8a770fbfbf0e33e91d5da18..dab8c0db2b86280602c3b25f2558c54e016a10f9 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 171adcd85091adc22d7482b443e0594a298be070..fa51d00a1c0996f0c0ce8062d58bbb1750a0d999 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 7000f3f1495c517a36b7377b069d260c462f9544..d5cb160bba83ad56bb3f78bb9768e0e0bb3c3272 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 70fb15f1662252baaec7cc3b2e7e82520bbc77de..eba367f4a90596414df4ad16fdce3fbb1ab7a457 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 7b31c830c595c85fe1e0eeb81416300cc0feabdc..4169bb78f4da1f5c324db2242ef98b64a55ddc8e 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 5184b39dc967baa24794696f481d4d416919096f..5ad58655676300d00b47a669f518e1076a7fb9eb 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 4f4d5cd0645dc5766f412f705d9ebc36b72cada6..81d0c154d4c05d9a7e650c970d355763d129ec85 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 2a6437f7bb7efb509dc0558bb113a1e80966785d..16c970145d0091e1187511eda1017d0fbf56e984 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 c0baef92e4d72f0a9d52a8ae7bb2a7544eb9e581..434dc86e49fe3498ff51f2f54f279415c50e6b17 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 0bc13cb9a9e897b37f524c25cf252de1618dfb0a..16e39bc3a7dce04a4641f9f523885b7bb116c263 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 e1b80dcf0380cee38ec5daedebeaa3030b6499a5..53f44dcc207b5a66efe7de89a0e4bd5a88008234 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 987d52b45bdba74919d3ded16be968d27bdff789..756dbbb42670cab2840d9357994bfbf79698bb7a 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 34c7a2e8ab38a7a4de69816040821b4ed3cde398..b42a58591143564af14fe50008411b35cc3521a5 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 3361d6fa1d2d4e847048f7045d510b2a49414900..97b24430c0f2718bc331870fdb9dd489125fd02b 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