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
Hide whitespace changes
Inline Side-by-side
Showing
with 43 additions and 43 deletions
.bumpversion.cfg
+ 1
− 1
View file @ 7e576a5f
[bumpversion]
current_version = 1.3.3
current_version = 1.3.4
commit = True
tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+)\.(?P<build>\d+))?
......
cache/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3"
version="1.3.4"
USER root
ADD install.sh \
......
chart/Chart.yaml
+ 1
− 1
View file @ 7e576a5f
......@@ -11,7 +11,7 @@ version: 1.0.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.3.3
appVersion: 1.3.4
maintainers:
- name: EOX IT Services GmbH
......
chart/values.yaml
+ 1
− 1
View file @ 7e576a5f
......@@ -356,7 +356,7 @@ replicaCount: 1
image:
repository: registry.gitlab.eox.at/esa/prism/vs
pullPolicy: IfNotPresent
tag: "release-1.3.3"
tag: "release-1.3.4"
imagePullSecrets: []
nameOverride: ""
......
client/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3"
version="1.3.4"
COPY html/ /usr/share/nginx/html/
config/dem_index-ops.html
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3">
<meta name="application" content="VS Client release-1.3.4">
<title>PRISM View Server</title>
<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">
......
config/emg_index-ops.html
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3">
<meta name="application" content="VS Client release-1.3.4">
<title>PRISM View Server</title>
<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">
......
config/vhr18_index-ops.html
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3">
<meta name="application" content="VS Client release-1.3.4">
<title>PRISM View Server</title>
<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">
......
core/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -33,7 +33,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.3.3"
version="1.3.4"
USER root
......
core/setup.py
+ 1
− 1
View file @ 7e576a5f
......@@ -6,7 +6,7 @@ long_description = ""
setup(
name="registrar", # Replace with your own username
version="1.3.3",
version="1.3.4",
author="",
author_email="",
description="registrar for PVS",
......
docker-compose.base.ops.yml
+ 1
− 1
View file @ 7e576a5f
version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion
x-vs-version: :release-1.3.4 # bumpversion
services:
reverse-proxy:
image: traefik:2.4
......
docker-compose.dem.ops.yml
+ 8
− 8
View file @ 7e576a5f
version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion
x-vs-version: :release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.4 # bumpversion
deploy:
placement:
constraints: [node.role == manager]
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:
- 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.4 # bumpversion
volumes:
- type: bind
source: /var/vhr
......
docker-compose.emg.ops.yml
+ 9
− 9
View file @ 7e576a5f
version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion
x-vs-version: :release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # bumpversion
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
......@@ -63,7 +63,7 @@ services:
networks:
- extnet
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:
- source: mapcache-ops
target: /mapcache-template.xml
......@@ -121,7 +121,7 @@ services:
networks:
- extnet
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:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
......@@ -131,19 +131,19 @@ services:
constraints:
- node.labels.type == internal
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:
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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.4 # bumpversion
deploy:
placement:
constraints: [node.role == manager]
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:
- source: client-ops
target: /usr/share/nginx/html/index.html
......@@ -182,7 +182,7 @@ services:
networks:
- extnet
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:
- type: bind
source: /var/vhr
......@@ -193,7 +193,7 @@ services:
constraints:
- node.labels.type == internal
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:
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)"
......
docker-compose.logging.ops.yml
+ 2
− 2
View file @ 7e576a5f
version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion
x-vs-version: :release-1.3.4 # bumpversion
services:
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:
placement:
# this is not strictly required, but feels right
......
docker-compose.vhr18.ops.yml
+ 8
− 8
View file @ 7e576a5f
version: "3.6"
x-vs-version: :release-1.3.3 # bumpversion
x-vs-version: :release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:release-1.3.4 # 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-1.3.4 # bumpversion
deploy:
placement:
constraints: [node.role == manager]
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:
- 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.3.3 # bumpversion
image: registry.gitlab.eox.at/esa/prism/vs/pvs_preprocessor:release-1.3.4 # bumpversion
volumes:
- type: bind
source: /var/vhr
......
fluentd/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3"
version="1.3.4"
USER root
RUN gem install fluent-plugin-elasticsearch \
......
ingestor/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3"
version="1.3.4"
USER root
ADD install.sh requirements.txt \
......
preprocessor/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3"
version="1.3.4"
ENV LC_ALL=C.UTF-8
ENV LANG=C.UTF-8
......
preprocessor/setup.py
+ 1
− 1
View file @ 7e576a5f
......@@ -6,7 +6,7 @@ long_description = ""
setup(
name="preprocessor", # Replace with your own username
version="1.3.3",
version="1.3.4",
author="",
author_email="",
description="preprocessor for PVS",
......
sftp/Dockerfile
+ 1
− 1
View file @ 7e576a5f
......@@ -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.3.3"
version="1.3.4"
RUN mkdir /etc/sftp.d
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment