EOX GitLab Instance

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

remove .env file, minor updates

parent e1da9004
No related branches found
No related tags found
No related merge requests found
Pipeline #20703 passed
......@@ -7,3 +7,4 @@ __pycache__/
.pylintrc
build/
dist/
venv*
GDAL_DISABLE_READDIR_ON_OPEN={{GDAL_DISABLE_READDIR_ON_OPEN}}
CPL_VSIL_CURL_ALLOWED_EXTENSIONS={{CPL_VSIL_CURL_ALLOWED_EXTENSIONS}}
......@@ -172,9 +172,6 @@ services:
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
INSTANCE_DIR: "/var/www/pvs/ops/pvs_instance/"
{%- if environment == "staging" %}
UPLOAD_CONTAINER: "{{slug}}-data-staging"
{%- endif %}
deploy:
replicas: 1
placement:
......@@ -366,6 +363,7 @@ secrets:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:dev
environment:
DEV: "true"
DEBUG: "true"
ports:
- mode: host
target: 80
......@@ -377,6 +375,7 @@ secrets:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:dev
environment:
DEV: "true"
DEBUG: "true"
cache:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_cache:dev
ports:
......
......@@ -5,7 +5,6 @@ services:
volumes:
- db-data:/var/lib/postgresql/data
env_file:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_db.env
environment:
INSTANCE_ID: "prism-view-server_database"
......@@ -36,12 +35,10 @@ services:
source: instance-data
target: /var/www/pvs
env_file:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_db.env
- ./config/{{slug}}/{{slug}}_django.env
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD_{{slug | upper}}
- DJANGO_SECRET_KEY
environment:
INSTANCE_ID: "prism-view-server_renderer"
......@@ -51,8 +48,9 @@ services:
WAIT_SERVICES: "database:5432"
WAIT_TIMEOUT: 180
DJANGO_PASSWORD_FILE: "/run/secrets/DJANGO_PASSWORD"
OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD_{{slug | upper}}"
DJANGO_SECRET_KEY_FILE: "/run/secrets/DJANGO_SECRET_KEY"
GDAL_DISABLE_READDIR_ON_OPEN: "TRUE"
CPL_VSIL_CURL_ALLOWED_EXTENSIONS: ".TIF,.tif,.xml"
configs:
- source: init-db
target: /init-db.sh
......@@ -67,9 +65,7 @@ services:
- type: tmpfs
target: /tmp
env_file:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_db.env
- ./config/{{slug}}/{{slug}}_obs_cache.env
secrets:
- OS_PASSWORD
environment:
......@@ -116,6 +112,7 @@ services:
WAIT_SERVICES: "redis:6379"
OS_PASSWORD_FILE: "/run/secrets/OS_PASSWORD_{{slug | upper}}"
OS_PASSWORD_DOWNLOAD_FILE: "/run/secrets/OS_PASSWORD_DOWNLOAD"
GDAL_DISABLE_READDIR_ON_OPEN: "TRUE"
configs:
- source: preprocessor-config
target: /config.yaml
......@@ -134,8 +131,8 @@ services:
source: report-data
target: /mnt/reports/
env_file:
- ./config/{{slug}}/{{slug}}.env
- ./config/{{slug}}/{{slug}}_db.env
- ./config/{{slug}}/{{slug}}_django.env
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD_{{slug | upper}}
......@@ -152,6 +149,7 @@ services:
DJANGO_SECRET_KEY_FILE: "/run/secrets/DJANGO_SECRET_KEY"
REPORTING_DIR: "/mnt/reports/"
GDAL_DISABLE_READDIR_ON_OPEN: "EMPTY_DIR"
CPL_VSIL_CURL_ALLOWED_EXTENSIONS: ".TIF,.tif,.xml"
configs:
- source: init-db
target: /init-db.sh
......
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