From 248aceabae644f1028d6252abcd3f31355e20e42 Mon Sep 17 00:00:00 2001
From: George Vlahavas <vlahavas@gmail.com>
Date: Sat, 27 Mar 2021 13:04:42 +0200
Subject: [PATCH] Remove kea_composer container

composer is installed and run within the kea_api container anyway, so
it's not really needed.
---
 deploy.sh                         | 12 +-----------
 docker-compose-jfrog-composer.yml | 11 -----------
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 docker-compose-jfrog-composer.yml

diff --git a/deploy.sh b/deploy.sh
index a95265f..e1ae8a6 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 dump_logs() {
-  CONTAINERS="suricata elasticsearch logstash kibana webserver composer api od mltd mqtt timescaledb grafana"
+  CONTAINERS="suricata elasticsearch logstash kibana webserver api od mltd mqtt timescaledb grafana"
   for CONTAINER in $CONTAINERS; do
     echo "*** Logs for kea_$CONTAINER (start) ***"
     docker logs kea_$CONTAINER
@@ -20,19 +20,11 @@ docker login https://registry.curex-project.eu:443/artifactory/curex-local/
 # pull all containers
 docker-compose \
   -f docker-compose-jfrog.yml \
-  -f docker-compose-jfrog-composer.yml \
   pull
 
 sleep 1
 
 # Prepare installation
-echo "Preparing installation..."
-cd api
-cp .env.example .env
-docker run --rm -v $(pwd):/app \
-  registry.curex-project.eu:443/curex-local/kea_composer:2.0.7 \
-  install
-cd ..
 sh ./create_volumes.sh
 
 # Keep the timestamp of when starting up containers
@@ -52,7 +44,6 @@ while true; do
   # if any container other than composer has exited, bail out
   res=`docker ps -a | \
     grep "/curex-local/kea_" | \
-    grep -v "kea_composer" | \
     grep "Exited" | \
     wc -l`
   if [ $res -gt 0 ]; then
@@ -65,7 +56,6 @@ while true; do
   # count containers that are up
   res=`docker ps -a | \
     grep "/curex-local/kea_" | \
-    grep -v "kea_composer" | \
     grep "Up" | \
     wc -l`
   if [ $res -eq 11 ]; then
diff --git a/docker-compose-jfrog-composer.yml b/docker-compose-jfrog-composer.yml
deleted file mode 100644
index 3fb110e..0000000
--- a/docker-compose-jfrog-composer.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '3'
-
-services:
-  composer:
-    restart: 'no'
-    image: registry.curex-project.eu:443/curex-local/kea_composer:2.0.7
-    container_name: kea_composer
-    command: install
-    volumes:
-      - ./api:/app
-
-- 
2.2.2