rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-11-28 09:24:24 +01:00
Code Issues Releases Activity

[bug] unable to run the elastic-upgrade script

Browse Source
This commit is contained in:
Sylvain 2020-09-28 09:42:03 +02:00
parent 26c7610386
commit 8ac873179c
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -1,5 +1,7 @@
# Changelog Fab-manager
- Fix a bug: unable to run the elastic-upgrade script
## v4.5.7 2020 September 23
- Fix a bug: unable to run tests suite with run-tests.sh

10
scripts/elastic-upgrade.sh
View File

@ -337,10 +337,10 @@ upgrade_compose()
abs_dir=$(echo "$dir" | sed "s^\${PWD}^$FM_PATH^")
echo -e "\nCopying ElasticSearch 2.4 configuration files from GitHub to $abs_dir..."
mkdir -p "$abs_dir"
curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/elasticsearch.yml > "$abs_dir/elasticsearch.yml"
curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/docker/log4j2.properties > "$abs_dir/log4j2.properties"
curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/elasticsearch.yml > "$abs_dir/elasticsearch.yml"
curl -sSL https://raw.githubusercontent.com/sleede/fab-manager/master/setup/log4j2.properties > "$abs_dir/log4j2.properties"
fi
docker-compose pull
docker-compose pull elasticsearch
docker-compose up -d
wait_for_online
wait_for_green_status
@ -387,8 +387,8 @@ upgrade_docker()
then
configdir=$(echo "$volumes" | grep config | awk -F'[ :]' '{print $2}')
echo -e "\nCopying ElasticSearch 2.4 configuration files from $(pwd)/docker to $configdir..."
sudo cp docker/elasticsearch.yml "$configdir"
sudo cp docker/log4j2.properties "$configdir"
sudo cp setup/elasticsearch.yml "$configdir"
sudo cp setup/log4j2.properties "$configdir"
fi
docker pull "$image"
echo docker run --restart=always -d --name="$name" --network="$network" --ip="$ES_IP" "$mounts" "$ports" "$image_name" | bash