diff --git a/.bumpversion.cfg b/.bumpversion.cfg index bffdf4bf204814b1fbfe817565be311e75198c7e..598c152b5f26ded090fa6734760b35056aa93568 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.1.0 +current_version = 1.1.1 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 dd0bbb351f59beabdedc19faa48ddd532447d4b3..2732e29bb5526060ff442efd93d9f0338353e9bd 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.0" + version="1.1.1" USER root ADD install.sh \ diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 69fdce3463199ff4c3fd38f895ac504b0e89c47b..f3f51a3b2ab72950bbee3949e08a55c7cefa98a4 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -11,7 +11,7 @@ version: 0.2.0 # 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.0 +appVersion: 1.1.1 maintainers: - name: EOX IT Services GmbH diff --git a/chart/values.yaml b/chart/values.yaml index d592ccf78eb0fb384c3183f997e1bef4eff863d8..d545b7088206548b7004cf024bf6b92c9379ea68 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.0" + tag: "release-1.1.1" imagePullSecrets: [] nameOverride: "" diff --git a/client/Dockerfile b/client/Dockerfile index 9e46380530a9f559c22bd332c1f5467587b3eeda..e2e892b73dca83d1f0dba3d3bd9690b331a03afc 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.0" + version="1.1.1" COPY html/ /usr/share/nginx/html/ diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html index c152b01591ebfdcdde27055592e7ac332197e73b..bef5c20ffb65e5b9a7699aee5061a1723ba8d371 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.0"> + <meta name="application" content="VS Client release-1.1.1"> <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 340ca1034e6afb8cdd3db0701d7b867f6cc6cd63..36089ae1a1ce30e85ba122ec7a31e70638456dd6 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.0"> + <meta name="application" content="VS Client release-1.1.1"> <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 3ee551f3453a2d3fd2c560050129a1f754e13062..18f23817dee9a84faab20d9ab7f58837b767753f 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.0"> + <meta name="application" content="VS Client release-1.1.1"> <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 258f863b59dab38ac7fd612ae8ae7e3e0c8dda9e..94ceeffb6f5e5faa9f81be4d752070b68e15168c 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.0" + version="1.1.1" USER root diff --git a/core/setup.py b/core/setup.py index 3d85d8b59a64d0fe187deaf9a7dbfe2637d1f432..ab290d8695d69848caaff52e16d888abfe8e0dd0 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.0", + version="1.1.1", author="", author_email="", description="registrar for PVS", diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml index 694f2935e4c2ccd0cc3d35f25e2578a6459911d7..6f198777585a3e17c56eb5189876e8e70df3e299 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.0 # bumpversion +x-vs-version: :release-1.1.1 # bumpversion services: reverse-proxy: image: traefik:2.1 diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml index 965857791f2556e9d575269223e2de8883f0f929..e69764d1d9bdb45daa8a7f542f644b9fd46fb613 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.0 # bumpversion +x-vs-version: :release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.1 # bumpversion deploy: placement: constraints: [node.role == manager] client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.1 # bumpversion volumes: - type: bind source: /var/vhr diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml index d82ed5adf19d898f83165168750ba5ab0d86a323..6640787872967a001e7b6a8d22f8186d8e4ce4e6 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.0 # bumpversion +x-vs-version: :release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # 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.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.1 # 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.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # bumpversion environment: INSTALL_DIR: "/var/www/pvs/ops/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" @@ -123,19 +123,19 @@ services: constraints: - node.labels.type == internal ingestor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.1 # bumpversion deploy: placement: constraints: [node.role == manager] client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.1 # bumpversion configs: - source: client-ops target: /usr/share/nginx/html/index.html @@ -173,7 +173,7 @@ services: networks: - extnet preprocessor: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.1 # bumpversion volumes: - type: bind source: /var/vhr diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml index d219cea55ff99c7e4bdfcb42b09aba8906c21075..63e02e907e0da157e256d23f3b37a923e0c85e38 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.0 # bumpversion +x-vs-version: :release-1.1.1 # bumpversion services: fluentd: - image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.1.1 # 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 13e243ac0d66722224a1975312705107cadda454..580d9ade68514ecc8b8618eb933f15eff1555eb9 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.0 # bumpversion +x-vs-version: :release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.1 # bumpversion deploy: placement: constraints: [node.role == manager] client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.1 # 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.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.1 # bumpversion volumes: - type: bind source: /var/vhr diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile index 744e312e93d5d1767bea794fe01fc2e646f3ed3e..690f55dc8f008a01876ea003379374d10d871277 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.0" + version="1.1.1" USER root RUN gem install fluent-plugin-elasticsearch \ diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile index 57eb6d2ef2c7de95c3a9c8dad484d25e65c22bb9..4c65489abaa0d635aa63bc0e4e06ba3a2bf5ef93 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.0" + version="1.1.1" USER root ADD install.sh requirements.txt \ diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile index 6cc0b8e20457f0787aee2b8e08477c9624863cef..534855a4f46123aa8380dcc620481a367a2b985f 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.0" + version="1.1.1" ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 diff --git a/preprocessor/setup.py b/preprocessor/setup.py index 4ae7639fccdececd35e7e1a748b34278549ebb92..0e167f2684e3e30f9695b2b543311ff60043ffe7 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.0", + version="1.1.1", author="", author_email="", description="preprocessor for PVS", diff --git a/sftp/Dockerfile b/sftp/Dockerfile index 24ba9d4e0e5fcb49464e5a9300427ef7d99d747d..e3ef48e468089679a89eacd66c48088570f88255 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.0" + version="1.1.1" RUN mkdir /etc/sftp.d diff --git a/testing/Dockerfile b/testing/Dockerfile index df1d65072834ece066255bf6e6c7d6a501986d34..e1da6626ec4a694426c1dc82153f6b0209aba045 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.0" + version="1.1.1" FROM docker:19.03.13-dind