EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 7e576a5f authored by Nikola Jankovic's avatar Nikola Jankovic :computer:
Browse files

Bump version: 1.3.3 → 1.3.4

parent e42b7844
No related branches found
No related tags found
1 merge request!82Staging to master
Showing with 43 additions and 43 deletions
[bumpversion] [bumpversion]
current_version = 1.3.3 current_version = 1.3.4
commit = True commit = True
tag = True tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
......
...@@ -31,7 +31,7 @@ LABEL name="prism view server cache" \ ...@@ -31,7 +31,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server cache" \ type="prism view server cache" \
version="1.3.3" version="1.3.4"
USER root USER root
ADD install.sh \ ADD install.sh \
......
...@@ -11,7 +11,7 @@ version: 1.0.0 ...@@ -11,7 +11,7 @@ version: 1.0.0
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 1.3.3 appVersion: 1.3.4
maintainers: maintainers:
- name: EOX IT Services GmbH - name: EOX IT Services GmbH
......
...@@ -356,7 +356,7 @@ replicaCount: 1 ...@@ -356,7 +356,7 @@ replicaCount: 1
image: image:
repository: registry.gitlab.eox.at/esa/prism/vs repository: registry.gitlab.eox.at/esa/prism/vs
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tag: "release-1.3.3" tag: "release-1.3.4"
imagePullSecrets: [] imagePullSecrets: []
nameOverride: "" nameOverride: ""
......
...@@ -31,6 +31,6 @@ LABEL name="prism view server client" \ ...@@ -31,6 +31,6 @@ LABEL name="prism view server client" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server client" \ type="prism view server client" \
version="1.3.3" version="1.3.4"
COPY html/ /usr/share/nginx/html/ COPY html/ /usr/share/nginx/html/
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="application" content="VS Client release-1.3.3"> <meta name="application" content="VS Client release-1.3.4">
<title>PRISM View Server</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/favicon.ico" type="image/x-icon"> <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"> <link rel="icon" sizes="16x16" href="//eox.at/favicon-16x16.png" type="image/png">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="application" content="VS Client release-1.3.3"> <meta name="application" content="VS Client release-1.3.4">
<title>PRISM View Server</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/favicon.ico" type="image/x-icon"> <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"> <link rel="icon" sizes="16x16" href="//eox.at/favicon-16x16.png" type="image/png">
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html;charset=UTF-8"> <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="application" content="VS Client release-1.3.3"> <meta name="application" content="VS Client release-1.3.4">
<title>PRISM View Server</title> <title>PRISM View Server</title>
<link rel="icon" href="//eox.at/favicon.ico" type="image/x-icon"> <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"> <link rel="icon" sizes="16x16" href="//eox.at/favicon-16x16.png" type="image/png">
......
...@@ -33,7 +33,7 @@ LABEL name="prism view server core" \ ...@@ -33,7 +33,7 @@ LABEL name="prism view server core" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server core" \ type="prism view server core" \
version="1.3.3" version="1.3.4"
USER root USER root
......
...@@ -6,7 +6,7 @@ long_description = "" ...@@ -6,7 +6,7 @@ long_description = ""
setup( setup(
name="registrar", # Replace with your own username name="registrar", # Replace with your own username
version="1.3.3", version="1.3.4",
author="", author="",
author_email="", author_email="",
description="registrar for PVS", description="registrar for PVS",
......
version: "3.6" version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion x-vs-version: :release-1.3.4 # bumpversion
services: services:
reverse-proxy: reverse-proxy:
image: traefik:2.4 image: traefik:2.4
......
version: "3.6" version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion x-vs-version: :release-1.3.4 # bumpversion
services: services:
database: database:
volumes: volumes:
...@@ -8,7 +8,7 @@ services: ...@@ -8,7 +8,7 @@ services:
tmpfs: tmpfs:
size: 536870912 size: 536870912
renderer: renderer:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment: environment:
INSTALL_DIR: "/var/www/pvs/ops/" INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
...@@ -40,7 +40,7 @@ services: ...@@ -40,7 +40,7 @@ services:
networks: networks:
- extnet - extnet
cache: cache:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.4 # bumpversion
configs: configs:
- source: mapcache-ops - source: mapcache-ops
target: /mapcache-template.xml target: /mapcache-template.xml
...@@ -73,7 +73,7 @@ services: ...@@ -73,7 +73,7 @@ services:
networks: networks:
- extnet - extnet
registrar: registrar:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment: environment:
INSTALL_DIR: "/var/www/pvs/ops/" INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
...@@ -83,19 +83,19 @@ services: ...@@ -83,19 +83,19 @@ services:
constraints: constraints:
- node.labels.type == internal - node.labels.type == internal
ingestor: ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.4 # bumpversion
environment: environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue" REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
sftp: sftp:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.4 # bumpversion
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
client: client:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.3.4 # bumpversion
configs: configs:
- source: client-ops - source: client-ops
target: /usr/share/nginx/html/index.html target: /usr/share/nginx/html/index.html
...@@ -123,7 +123,7 @@ services: ...@@ -123,7 +123,7 @@ services:
networks: networks:
- extnet - extnet
preprocessor: preprocessor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.4 # bumpversion
volumes: volumes:
- type: bind - type: bind
source: /var/vhr source: /var/vhr
......
version: "3.6" version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion x-vs-version: :release-1.3.4 # bumpversion
services: services:
database: database:
volumes: volumes:
...@@ -8,7 +8,7 @@ services: ...@@ -8,7 +8,7 @@ services:
tmpfs: tmpfs:
size: 536870912 size: 536870912
renderer: renderer:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment: environment:
INSTALL_DIR: "/var/www/pvs/ops/" INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
...@@ -63,7 +63,7 @@ services: ...@@ -63,7 +63,7 @@ services:
networks: networks:
- extnet - extnet
cache: cache:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.4 # bumpversion
configs: configs:
- source: mapcache-ops - source: mapcache-ops
target: /mapcache-template.xml target: /mapcache-template.xml
...@@ -121,7 +121,7 @@ services: ...@@ -121,7 +121,7 @@ services:
networks: networks:
- extnet - extnet
registrar: registrar:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment: environment:
INSTALL_DIR: "/var/www/pvs/ops/" INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
...@@ -131,19 +131,19 @@ services: ...@@ -131,19 +131,19 @@ services:
constraints: constraints:
- node.labels.type == internal - node.labels.type == internal
ingestor: ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.4 # bumpversion
environment: environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue" REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
sftp: sftp:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.4 # bumpversion
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
client: client:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.3.4 # bumpversion
configs: configs:
- source: client-ops - source: client-ops
target: /usr/share/nginx/html/index.html target: /usr/share/nginx/html/index.html
...@@ -182,7 +182,7 @@ services: ...@@ -182,7 +182,7 @@ services:
networks: networks:
- extnet - extnet
preprocessor: preprocessor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.4 # bumpversion
volumes: volumes:
- type: bind - type: bind
source: /var/vhr source: /var/vhr
...@@ -193,7 +193,7 @@ services: ...@@ -193,7 +193,7 @@ services:
constraints: constraints:
- node.labels.type == internal - node.labels.type == internal
shibauth-emg: shibauth-emg:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_shibauth:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_shibauth:release-1.3.4 # bumpversion
environment: environment:
APACHE_SERVERNAME: "https://emg.pass.copernicus.eu:443" 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)" PROXY_USER_CATEGORY_ALLOW_RENDERER: "(Copernicus_Services|Union_Inst|Union_Research_Projects_space|Union_Research_Projects_non-space|Public_Auth)"
......
version: "3.6" version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion x-vs-version: :release-1.3.4 # bumpversion
services: services:
fluentd: fluentd:
image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/fluentd:release-1.3.4 # bumpversion
deploy: deploy:
placement: placement:
# this is not strictly required, but feels right # this is not strictly required, but feels right
......
version: "3.6" version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion x-vs-version: :release-1.3.4 # bumpversion
services: services:
database: database:
volumes: volumes:
...@@ -8,7 +8,7 @@ services: ...@@ -8,7 +8,7 @@ services:
tmpfs: tmpfs:
size: 536870912 size: 536870912
renderer: renderer:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment: environment:
INSTALL_DIR: "/var/www/pvs/ops/" INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
...@@ -40,7 +40,7 @@ services: ...@@ -40,7 +40,7 @@ services:
networks: networks:
- extnet - extnet
cache: cache:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.4 # bumpversion
configs: configs:
- source: mapcache-ops - source: mapcache-ops
target: /mapcache-template.xml target: /mapcache-template.xml
...@@ -73,7 +73,7 @@ services: ...@@ -73,7 +73,7 @@ services:
networks: networks:
- extnet - extnet
registrar: registrar:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment: environment:
INSTALL_DIR: "/var/www/pvs/ops/" INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/" INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
...@@ -83,19 +83,19 @@ services: ...@@ -83,19 +83,19 @@ services:
constraints: constraints:
- node.labels.type == internal - node.labels.type == internal
ingestor: ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.4 # bumpversion
environment: environment:
REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue" REDIS_PREPROCESS_MD_QUEUE_KEY: "preprocess_queue"
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
sftp: sftp:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.4 # bumpversion
deploy: deploy:
placement: placement:
constraints: [node.role == manager] constraints: [node.role == manager]
client: client:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:release-1.3.4 # bumpversion
configs: configs:
- source: client-ops - source: client-ops
target: /usr/share/nginx/html/index.html target: /usr/share/nginx/html/index.html
...@@ -123,7 +123,7 @@ services: ...@@ -123,7 +123,7 @@ services:
networks: networks:
- extnet - extnet
preprocessor: preprocessor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.3 # bumpversion image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.4 # bumpversion
volumes: volumes:
- type: bind - type: bind
source: /var/vhr source: /var/vhr
......
...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ ...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server fluentd" \ type="prism view server fluentd" \
version="1.3.3" version="1.3.4"
USER root USER root
RUN gem install fluent-plugin-elasticsearch \ RUN gem install fluent-plugin-elasticsearch \
......
...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \ ...@@ -32,7 +32,7 @@ LABEL name="prism view server cache" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2020 EOX IT Services GmbH <https://eox.at>" \
type="prism view server ingestor" \ type="prism view server ingestor" \
version="1.3.3" version="1.3.4"
USER root USER root
ADD install.sh requirements.txt \ ADD install.sh requirements.txt \
......
...@@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \ ...@@ -32,7 +32,7 @@ LABEL name="prism view server preprocessor" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \ license="MIT Copyright (C) 2019 EOX IT Services GmbH <https://eox.at>" \
type="prism view server preprocessor" \ type="prism view server preprocessor" \
version="1.3.3" version="1.3.4"
ENV LC_ALL=C.UTF-8 ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8
......
...@@ -6,7 +6,7 @@ long_description = "" ...@@ -6,7 +6,7 @@ long_description = ""
setup( setup(
name="preprocessor", # Replace with your own username name="preprocessor", # Replace with your own username
version="1.3.3", version="1.3.4",
author="", author="",
author_email="", author_email="",
description="preprocessor for PVS", description="preprocessor for PVS",
......
...@@ -31,7 +31,7 @@ LABEL name="prism view server docker base image" \ ...@@ -31,7 +31,7 @@ LABEL name="prism view server docker base image" \
vendor="EOX IT Services GmbH <https://eox.at>" \ vendor="EOX IT Services GmbH <https://eox.at>" \
license="MIT Copyright (C) 2020 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" \ type="prism view server docker base image" \
version="1.3.3" version="1.3.4"
RUN mkdir /etc/sftp.d RUN mkdir /etc/sftp.d
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment