EOX GitLab Instance

Skip to content
Snippets Groups Projects
Commit 0a4fc701 authored by Lubomir Dolezal's avatar Lubomir Dolezal
Browse files

update images not part of chart, remove obs env file reference

parent 98e8063b
No related branches found
No related tags found
No related merge requests found
Pipeline #20673 passed
version: "3.6"
version: "3.8"
services:
{%- if environment != "dev" %}
database:
......@@ -188,7 +188,7 @@ services:
placement:
constraints: [node.role == manager]
sftp:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_sftp:release-2.0.0
image: registry.gitlab.eox.at/esa/prism/sftp:1.0.0
deploy:
placement:
constraints: [node.role == manager]
......@@ -258,7 +258,7 @@ services:
- node.labels.type == internal
{%- endif %}
shibauth-{{slug}}:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_shibauth:release-2.0.0
image: registry.gitlab.eox.at/esa/prism/shibauth:1.0.0
environment:
APACHE_SERVERNAME: "https://sso.{{slug}}.pass.copernicus.eu:443"
USER_CATEGORY_ALLOW_RENDERER: "{{shibauth_renderer}}"
......
version: "3.6"
version: "3.8"
services:
database:
image: mdillon/postgis:10
......@@ -39,8 +39,7 @@ services:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_db.env
- ./config/{{slug}}/{{slug}}_django.env
- ./config/{{slug}}/{{slug}}_obs.env
secrets:
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD_{{slug | upper}}
- DJANGO_SECRET_KEY
......@@ -109,8 +108,7 @@ services:
preprocessor:
env_file:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_obs.env
secrets:
secrets:
- OS_PASSWORD_{{slug | upper}}
- OS_PASSWORD_DOWNLOAD
environment:
......@@ -138,8 +136,7 @@ services:
env_file:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_db.env
- ./config/{{slug}}/{{slug}}_obs.env
secrets:
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD_{{slug | upper}}
- DJANGO_SECRET_KEY
......
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