Commit 248aceabae644f1028d6252abcd3f31355e20e42
1 parent
885c3c7a40
Exists in
master
and in
4 other branches
Remove kea_composer container
composer is installed and run within the kea_api container anyway, so it's not really needed.
Showing 2 changed files with 1 additions and 22 deletions
deploy.sh
View file @
248acea
| 1 | 1 | #!/bin/sh |
| 2 | 2 | |
| 3 | 3 | dump_logs() { |
| 4 | - CONTAINERS="suricata elasticsearch logstash kibana webserver composer api od mltd mqtt timescaledb grafana" | |
| 4 | + CONTAINERS="suricata elasticsearch logstash kibana webserver api od mltd mqtt timescaledb grafana" | |
| 5 | 5 | for CONTAINER in $CONTAINERS; do |
| 6 | 6 | echo "*** Logs for kea_$CONTAINER (start) ***" |
| 7 | 7 | docker logs kea_$CONTAINER |
| 8 | 8 | |
| ... | ... | @@ -20,19 +20,11 @@ |
| 20 | 20 | # pull all containers |
| 21 | 21 | docker-compose \ |
| 22 | 22 | -f docker-compose-jfrog.yml \ |
| 23 | - -f docker-compose-jfrog-composer.yml \ | |
| 24 | 23 | pull |
| 25 | 24 | |
| 26 | 25 | sleep 1 |
| 27 | 26 | |
| 28 | 27 | # Prepare installation |
| 29 | -echo "Preparing installation..." | |
| 30 | -cd api | |
| 31 | -cp .env.example .env | |
| 32 | -docker run --rm -v $(pwd):/app \ | |
| 33 | - registry.curex-project.eu:443/curex-local/kea_composer:2.0.7 \ | |
| 34 | - install | |
| 35 | -cd .. | |
| 36 | 28 | sh ./create_volumes.sh |
| 37 | 29 | |
| 38 | 30 | # Keep the timestamp of when starting up containers |
| ... | ... | @@ -52,7 +44,6 @@ |
| 52 | 44 | # if any container other than composer has exited, bail out |
| 53 | 45 | res=`docker ps -a | \ |
| 54 | 46 | grep "/curex-local/kea_" | \ |
| 55 | - grep -v "kea_composer" | \ | |
| 56 | 47 | grep "Exited" | \ |
| 57 | 48 | wc -l` |
| 58 | 49 | if [ $res -gt 0 ]; then |
| ... | ... | @@ -65,7 +56,6 @@ |
| 65 | 56 | # count containers that are up |
| 66 | 57 | res=`docker ps -a | \ |
| 67 | 58 | grep "/curex-local/kea_" | \ |
| 68 | - grep -v "kea_composer" | \ | |
| 69 | 59 | grep "Up" | \ |
| 70 | 60 | wc -l` |
| 71 | 61 | if [ $res -eq 11 ]; then |