diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a3204d2c5f781a4b60c029a862ae576ddb9045b5..bffdf4bf204814b1fbfe817565be311e75198c7e 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.0 +current_version = 1.1.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 6bbd951a6e7ab45f611764c3ae66707502fb5f17..dd0bbb351f59beabdedc19faa48ddd532447d4b3 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" + version="1.1.0" USER root ADD install.sh \ diff --git a/chart/Chart.yaml b/chart/Chart.yaml index d3eb8f1e8a2a933455f25a34ec50493d04b53f05..88a952fc13889a3b2068eade0d46a5b2035463e5 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -11,7 +11,7 @@ version: 0.1.0-beta.1 # 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.0.0 +appVersion: 1.1.0 maintainers: - name: EOX IT Services GmbH diff --git a/chart/values.yaml b/chart/values.yaml index fdb20631dee696ff34f466eb6448cbb0f1e93031..d592ccf78eb0fb384c3183f997e1bef4eff863d8 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.0.0" + tag: "release-1.1.0" imagePullSecrets: [] nameOverride: "" diff --git a/client/Dockerfile b/client/Dockerfile index ff1e60a2ed025c828c5652c250eec8c2bcdca3e1..9e46380530a9f559c22bd332c1f5467587b3eeda 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" + version="1.1.0" COPY html/ /usr/share/nginx/html/ diff --git a/config/dem_index-ops.html b/config/dem_index-ops.html index dab8c0db2b86280602c3b25f2558c54e016a10f9..c152b01591ebfdcdde27055592e7ac332197e73b 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"> + <meta name="application" content="VS Client release-1.1.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 99b3048b05161d219cfa5e5a5cc0f32e6b481937..340ca1034e6afb8cdd3db0701d7b867f6cc6cd63 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"> + <meta name="application" content="VS Client release-1.1.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 d5cb160bba83ad56bb3f78bb9768e0e0bb3c3272..3ee551f3453a2d3fd2c560050129a1f754e13062 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"> + <meta name="application" content="VS Client release-1.1.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 1aa844c5dff00c2e42e9c4f18f4721ea5af89093..258f863b59dab38ac7fd612ae8ae7e3e0c8dda9e 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" + version="1.1.0" USER root diff --git a/core/setup.py b/core/setup.py index 223d0ed5738d4a44a88dc5e5d6233d1ea820725a..3d85d8b59a64d0fe187deaf9a7dbfe2637d1f432 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.0.0", + version="1.1.0", author="", author_email="", description="registrar for PVS", diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml index 4169bb78f4da1f5c324db2242ef98b64a55ddc8e..694f2935e4c2ccd0cc3d35f25e2578a6459911d7 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 # bumpversion +x-vs-version: :release-1.1.0 # bumpversion services: reverse-proxy: image: traefik:2.1 diff --git a/docker-compose.dem.ops.yml b/docker-compose.dem.ops.yml index 66277ece079da93d059928a9eee6129a60cab30f..965857791f2556e9d575269223e2de8883f0f929 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 # bumpversion +x-vs-version: :release-1.1.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 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.0 # bumpversion deploy: placement: constraints: [node.role == manager] client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.0 # bumpversion volumes: - type: bind source: /var/vhr diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml index 2e7e0f98660bd6a0a563ea5b96824cce72a79816..d82ed5adf19d898f83165168750ba5ab0d86a323 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 # bumpversion +x-vs-version: :release-1.1.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 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.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 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.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 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.0 # 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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.0 # bumpversion deploy: placement: constraints: [node.role == manager] client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.0 # 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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.0 # bumpversion volumes: - type: bind source: /var/vhr diff --git a/docker-compose.logging.ops.yml b/docker-compose.logging.ops.yml index 16c970145d0091e1187511eda1017d0fbf56e984..d219cea55ff99c7e4bdfcb42b09aba8906c21075 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 # bumpversion +x-vs-version: :release-1.1.0 # bumpversion services: fluentd: - image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.1.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 a6cacf4fadcee4622b8e386d57239350206a6efc..13e243ac0d66722224a1975312705107cadda454 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 # bumpversion +x-vs-version: :release-1.1.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 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.1.0 # bumpversion deploy: placement: constraints: [node.role == manager] client: - image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.1.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.0.0 # bumpversion + image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.1.0 # bumpversion volumes: - type: bind source: /var/vhr diff --git a/fluentd/Dockerfile b/fluentd/Dockerfile index 16e39bc3a7dce04a4641f9f523885b7bb116c263..744e312e93d5d1767bea794fe01fc2e646f3ed3e 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" + version="1.1.0" USER root RUN gem install fluent-plugin-elasticsearch \ diff --git a/ingestor/Dockerfile b/ingestor/Dockerfile index 311f3d7a6241ece034540a27ac59ea101359e4d7..57eb6d2ef2c7de95c3a9c8dad484d25e65c22bb9 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" + version="1.1.0" USER root ADD install.sh requirements.txt \ diff --git a/preprocessor/Dockerfile b/preprocessor/Dockerfile index 5d9a2c31227c5fd8b97f98b12ece83a3bb1a9772..6cc0b8e20457f0787aee2b8e08477c9624863cef 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" + version="1.1.0" ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 diff --git a/preprocessor/setup.py b/preprocessor/setup.py index b42a58591143564af14fe50008411b35cc3521a5..4ae7639fccdececd35e7e1a748b34278549ebb92 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", + version="1.1.0", author="", author_email="", description="preprocessor for PVS", diff --git a/sftp/Dockerfile b/sftp/Dockerfile index 7de2476942a10ee3a19ad41c387954a9e8c0a257..24ba9d4e0e5fcb49464e5a9300427ef7d99d747d 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.0.0" + version="1.1.0" RUN mkdir /etc/sftp.d diff --git a/testing/Dockerfile b/testing/Dockerfile index 97b24430c0f2718bc331870fdb9dd489125fd02b..df1d65072834ece066255bf6e6c7d6a501986d34 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" + version="1.1.0" FROM docker:19.03.13-dind