EOX GitLab Instance

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

remove the need for separate <stack>_name.env file

parent 5e368930
No related branches found
No related tags found
2 merge requests!49Production release 1.1.1,!42Redis statuses
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 72 deletions
cache/Dockerfile
+ 2
− 2
View file @ 70e3f3d3
......@@ -47,9 +47,9 @@ ENV COLLECTION_ID= \
APACHE_ServerName="pvs_cache" \
APACHE_ServerAdmin="office@eox.at" \
APACHE_NGEO_CACHE_ALIAS="/ows" \
REDIS_HOST= \
REDIS_HOST="redis" \
REDIS_PORT="6379" \
REDIS_QUEUE_KEY="seed_queue" \
REDIS_SEED_QUEUE_KEY="seed_queue" \
ST_AUTH_VERSION=3 \
OS_AUTH_URL= \
OS_USERNAME= \
......
cache/run-seeder.sh
+ 1
− 1
View file @ 70e3f3d3
......@@ -4,4 +4,4 @@
echo "Running seeder"
python3 /seeder.py --mode redis --redis-host ${REDIS_HOST} --redis-port ${REDIS_PORT} --redis-queue-key ${REDIS_QUEUE_KEY}
python3 /seeder.py --mode redis --redis-host ${REDIS_HOST} --redis-port ${REDIS_PORT} --redis-queue-key ${REDIS_SEED_QUEUE_KEY}
chart/values.yaml
+ 7
− 4
View file @ 70e3f3d3
......@@ -49,12 +49,15 @@ config:
redis:
REDIS_PORT: "6379"
REDIS_PREPROCESS_QUEUE_KEY: preprocess_queue
REDIS_QUEUE_KEY: seed_queue
REDIS_PREPROCESS_MD_QUEUE_KEY: preprocess-md_queue
REDIS_PREPROCESS_FAILURE_KEY: preprocess-failure_set
REDIS_PREPROCESS_PROGRESS_KEY: preprocessing_set
REDIS_PREPROCESS_SUCCESS_KEY: preprocess-success_set
REDIS_REGISTER_QUEUE_KEY: register_queue
REDIS_REGISTERED_SET_KEY: registered_set
REDIS_REGISTER_FAILURE_KEY: register-failure_set
REDIS_REGISTER_PROGRESS_KEY: registering_set
REDIS_REGISTER_SUCCESS_KEY: register-success_set
REDIS_SEED_QUEUE_KEY: seed_queue
REDIS_SET_KEY: registered_set
client:
layers: {}
# VHR_IMAGE_2018_Level_1:
......
core/Dockerfile
+ 6
− 6
View file @ 70e3f3d3
......@@ -65,12 +65,12 @@ ENV INSTANCE_ID="prism-view-server_core" \
APACHE_ServerName="pvs_instance" \
APACHE_ServerAdmin="office@eox.at" \
APACHE_ALIAS="pvs" \
REDIS_HOST= redis \
REDIS_PORT= 6379 \
REDIS_REGISTER_QUEUE_KEY= register_queue \
REDIS_REGISTER_FAILURE_KEY= register-failure_set \
REDIS_REGISTER_PROGRESS_KEY= registering_set \
REDIS_REGISTER_SUCCESS_KEY= register-success_set \
REDIS_HOST="redis" \
REDIS_PORT="6379" \
REDIS_REGISTER_QUEUE_KEY="register_queue" \
REDIS_REGISTER_FAILURE_KEY="register-failure_set" \
REDIS_REGISTER_PROGRESS_KEY="registering_set" \
REDIS_REGISTER_SUCCESS_KEY="register-success_set" \
INIT_SCRIPTS="/configure.sh" \
COLLECT_STATIC="false" \
REGISTRAR_REPLACE=
......
docker-compose.dem.yml
+ 0
− 5
View file @ 70e3f3d3
......@@ -92,7 +92,6 @@ services:
env_file:
- env/dem.env
- env/dem_obs.env
- env/dem_redis.env
secrets:
- OS_PASSWORD
environment:
......@@ -111,7 +110,6 @@ services:
env_file:
- env/dem.env
- env/dem_obs.env
- env/dem_redis.env
secrets:
- OS_PASSWORD
- OS_PASSWORD_DOWNLOAD
......@@ -144,7 +142,6 @@ services:
- env/dem.env
- env/dem_db.env
- env/dem_obs.env
- env/dem_redis.env
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD
......@@ -190,8 +187,6 @@ services:
replicas: 1
ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:latest
env_file:
- env/dem_redis.env
environment:
INSTANCE_ID: "prism-view-server_ingestor"
deploy:
......
docker-compose.emg.yml
+ 0
− 5
View file @ 70e3f3d3
......@@ -91,7 +91,6 @@ services:
env_file:
- env/emg.env
- env/emg_obs.env
- env/emg_redis.env
secrets:
- OS_PASSWORD
environment:
......@@ -107,8 +106,6 @@ services:
["/run-seeder.sh"]
ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:latest
env_file:
- env/emg_redis.env
environment:
INSTANCE_ID: "prism-view-server_ingestor"
deploy:
......@@ -120,7 +117,6 @@ services:
env_file:
- env/emg.env
- env/emg_obs.env
- env/emg_redis.env
secrets:
- OS_PASSWORD
- OS_PASSWORD_DOWNLOAD
......@@ -153,7 +149,6 @@ services:
- env/emg.env
- env/emg_db.env
- env/emg_obs.env
- env/emg_redis.env
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD
......
docker-compose.vhr18.yml
+ 0
− 5
View file @ 70e3f3d3
......@@ -95,7 +95,6 @@ services:
env_file:
- env/vhr18.env
- env/vhr18_obs.env
- env/vhr18_redis.env
secrets:
- OS_PASSWORD
environment:
......@@ -111,8 +110,6 @@ services:
["/run-seeder.sh"]
ingestor:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_ingestor:latest
env_file:
- env/vhr18_redis.env
environment:
INSTANCE_ID: "prism-view-server_ingestor"
deploy:
......@@ -124,7 +121,6 @@ services:
env_file:
- env/vhr18.env
- env/vhr18_obs.env
- env/vhr18_redis.env
secrets:
- OS_PASSWORD
- OS_PASSWORD_DOWNLOAD
......@@ -157,7 +153,6 @@ services:
- env/vhr18.env
- env/vhr18_db.env
- env/vhr18_obs.env
- env/vhr18_redis.env
secrets:
- DJANGO_PASSWORD
- OS_PASSWORD
......
documentation/operator-guide/configuration.rst
+ 0
− 3
View file @ 70e3f3d3
......@@ -96,7 +96,6 @@ Environment variables and ``.env`` files are passed to the services via the
- env/stack.env
- env/stack_db.env
- env/stack_obs.env
- env/stack_redis.env
environment:
INSTANCE_ID: "prism-view-server_registrar"
INSTALL_DIR: "/var/www/pvs/dev/"
......@@ -118,8 +117,6 @@ The following ``.env`` files are typically used:
django admin user to be used with the admin GUI.
* ``<stack-name>_obs.env``: This contains access parameters for the object
storage(s).
* ``<stack-name>_redis.env``: Redis access credentials and queue names
Groups of Environment Variables
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
......
env/dem_redis.env deleted 100644 → 0
+ 0
− 11
View file @ 5e368930
REDIS_HOST=redis
REDIS_PORT=6379
REDIS_QUEUE_KEY=seed_queue
REDIS_PREPROCESS_QUEUE_KEY=preprocess_queue
REDIS_PREPROCESS_MD_QUEUE_KEY=preprocess-md_queue
REDIS_REGISTER_QUEUE_KEY=register_queue
REDIS_REGISTERED_SET_KEY=registered_set
REDIS_SET_KEY=registered_set
REDIS_SEED_QUEUE_KEY=seed_queue
env/emg_redis.env deleted 100644 → 0
+ 0
− 11
View file @ 5e368930
REDIS_HOST=redis
REDIS_PORT=6379
REDIS_QUEUE_KEY=seed_queue
REDIS_PREPROCESS_QUEUE_KEY=preprocess_queue
REDIS_PREPROCESS_MD_QUEUE_KEY=preprocess-md_queue
REDIS_REGISTER_QUEUE_KEY=register_queue
REDIS_REGISTERED_SET_KEY=registered_set
REDIS_SET_KEY=registered_set
REDIS_SEED_QUEUE_KEY=seed_queue
env/vhr18_redis.env deleted 100644 → 0
+ 0
− 11
View file @ 5e368930
REDIS_HOST=redis
REDIS_PORT=6379
REDIS_QUEUE_KEY=seed_queue
REDIS_PREPROCESS_QUEUE_KEY=preprocess_queue
REDIS_PREPROCESS_MD_QUEUE_KEY=preprocess-md_queue
REDIS_REGISTER_QUEUE_KEY=register_queue
REDIS_REGISTERED_SET_KEY=registered_set
REDIS_SET_KEY=registered_set
REDIS_SEED_QUEUE_KEY=seed_queue
ingestor/Dockerfile
+ 1
− 1
View file @ 70e3f3d3
......@@ -43,7 +43,7 @@ COPY app.py config.py filedaemon.py /
COPY ingestor/ /ingestor
ENV INSTANCE_ID="prism-view-server_ingestor" \
REDIS_HOST= \
REDIS_HOST="redis" \
REDIS_PORT="6379" \
REDIS_PREPROCESS_MD_QUEUE_KEY="preprocess-md_queue" \
INOTIFY_WATCH_DIR="/mnt/data"
......
preprocessor/Dockerfile
+ 7
− 7
View file @ 70e3f3d3
......@@ -64,13 +64,13 @@ ENV INSTANCE_ID="prism-data-access-server_preprocessor" \
OS_TENANT_NAME_DOWNLOAD= \
OS_REGION_NAME_DOWNLOAD= \
OS_USER_DOMAIN_NAME_DOWNLOAD= \
REDIS_HOST= redis \
REDIS_PORT= 6379 \
REDIS_PREPROCESS_QUEUE_KEY= preprocess_queue \
REDIS_PREPROCESS_MD_QUEUE_KEY= preprocess-md_queue \
REDIS_PREPROCESS_FAILURE_KEY= preprocess-failure_set \
REDIS_PREPROCESS_PROGRESS_KEY= preprocessing_set \
REDIS_PREPROCESS_SUCCESS_KEY= preprocess-success_set \
REDIS_HOST="redis" \
REDIS_PORT="6379" \
REDIS_PREPROCESS_QUEUE_KEY="preprocess_queue" \
REDIS_PREPROCESS_MD_QUEUE_KEY="preprocess-md_queue" \
REDIS_PREPROCESS_FAILURE_KEY="preprocess-failure_set" \
REDIS_PREPROCESS_PROGRESS_KEY="preprocessing_set" \
REDIS_PREPROCESS_SUCCESS_KEY="preprocess-success_set" \
PREPROCESSOR_DEBUG=
ADD run-preprocessor.sh \
......
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