From b85c060ea29001b750fbe30388e5576a1f29c53a Mon Sep 17 00:00:00 2001
From: Lubomir Bucek <lubomir.bucek@eox.at>
Date: Fri, 17 Jul 2020 10:12:08 +0200
Subject: [PATCH] cleanup
---
docker-compose.base.ops.yml | 3 +++
docker-compose.emg.ops.yml | 3 ---
docker-compose.emg.yml | 22 ----------------------
docker-compose.vhr18.ops.yml | 3 ---
docker-compose.vhr18.yml | 22 ----------------------
5 files changed, 3 insertions(+), 50 deletions(-)
diff --git a/docker-compose.base.ops.yml b/docker-compose.base.ops.yml
index 8fb37ee3..f9b2e18a 100644
--- a/docker-compose.base.ops.yml
+++ b/docker-compose.base.ops.yml
@@ -26,6 +26,7 @@ services:
networks:
- vhr18-extnet
- emg-extnet
+ - dem-extnet
volumes:
traefik-data:
networks:
@@ -33,3 +34,5 @@ networks:
name: vhr18-extnet
emg-extnet:
name: emg-extnet
+ dem-extnet:
+ name: dem-extnet
diff --git a/docker-compose.emg.ops.yml b/docker-compose.emg.ops.yml
index 35392439..99c08a48 100644
--- a/docker-compose.emg.ops.yml
+++ b/docker-compose.emg.ops.yml
@@ -80,9 +80,6 @@ services:
registrar:
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
- # redis-manager:
- # environment:
- # INSTALL_DIR: "/var/www/pvs/ops/"
client:
configs:
- source: client-ops
diff --git a/docker-compose.emg.yml b/docker-compose.emg.yml
index 9f31b3a6..594b7605 100644
--- a/docker-compose.emg.yml
+++ b/docker-compose.emg.yml
@@ -136,28 +136,6 @@ services:
- intnet
command:
["/run-registrar.sh"]
- # redis-manager:
- # image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
- # volumes:
- # - type: tmpfs
- # target: /tmp
- # - type: volume
- # source: cache-db
- # target: /cache-db
- # env_file:
- # - env/emg.env
- # - env/emg_db.env
- # - env/emg_redis.env
- # environment:
- # INSTANCE_ID: "prism-view-server_redis-manager"
- # INSTALL_DIR: "/var/www/pvs/dev/"
- # CACHE_DB_PATH: "/cache-db/emg_mapcache_cache.sqlite"
- # deploy:
- # replicas: 0
- # networks:
- # - intnet
- # command:
- # ["/run-redis-manager.sh"]
client:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
deploy:
diff --git a/docker-compose.vhr18.ops.yml b/docker-compose.vhr18.ops.yml
index 2c48f36b..238c2e74 100644
--- a/docker-compose.vhr18.ops.yml
+++ b/docker-compose.vhr18.ops.yml
@@ -80,9 +80,6 @@ services:
registrar:
environment:
INSTALL_DIR: "/var/www/pvs/ops/"
- # redis-manager:
- # environment:
- # INSTALL_DIR: "/var/www/pvs/ops/"
client:
configs:
- source: client-ops
diff --git a/docker-compose.vhr18.yml b/docker-compose.vhr18.yml
index d8d91f8a..8ee8fd13 100644
--- a/docker-compose.vhr18.yml
+++ b/docker-compose.vhr18.yml
@@ -146,28 +146,6 @@ services:
- intnet
command:
["/run-registrar.sh"]
- # redis-manager:
- # image: registry.gitlab.eox.at/esa/prism/vs/pvs_core:latest
- # volumes:
- # - type: tmpfs
- # target: /tmp
- # - type: volume
- # source: cache-db
- # target: /cache-db
- # env_file:
- # - env/vhr18.env
- # - env/vhr18_db.env
- # - env/vhr18_redis.env
- # environment:
- # INSTANCE_ID: "prism-view-server_redis-manager"
- # INSTALL_DIR: "/var/www/pvs/dev/"
- # CACHE_DB_PATH: "/cache-db/vhr18_mapcache_cache.sqlite"
- # deploy:
- # replicas: 0
- # networks:
- # - intnet
- # command:
- # ["/run-redis-manager.sh"]
client:
image: registry.gitlab.eox.at/esa/prism/vs/pvs_client:latest
deploy:
--
GitLab