From d55d4c59f8fec4c1b48973e18b23fc7dcb16b7d6 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Thu, 5 Apr 2018 09:24:49 +0200 Subject: [PATCH] fix docker image for elasticsearch 6 --- scripts/elastic-upgrade.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/elastic-upgrade.sh b/scripts/elastic-upgrade.sh index 3344a9d6b..73ac7cb96 100755 --- a/scripts/elastic-upgrade.sh +++ b/scripts/elastic-upgrade.sh @@ -221,7 +221,9 @@ upgrade_compose() echo -e "\nUpgrading docker-compose installation from $current to $target..." docker-compose stop elasticsearch docker-compose rm -f elasticsearch - sed -i.bak "s/image: elasticsearch:$current/image: elasticsearch:$target/g" "$FM_PATH/docker-compose.yml" + local image="elasticsearch:$target" + if [ $target = '6.2' ]; then image="elasticsearch-oss:$target"; fi + sed -i.bak "s/image: elasticsearch:$current/image: $image/g" "$FM_PATH/docker-compose.yml" docker-compose pull docker-compose up -d wait_for_online @@ -253,8 +255,10 @@ upgrade_docker() docker stop "$name" docker rm -f "$name" # run target elastic - docker pull "elasticsearch:$target" - echo docker run --restart=always -d --name="$name" --network="$network" --ip="$ES_IP" "$mounts" "elasticsearch:$target" | bash + local image="elasticsearch:$target" + if [ $target = '6.2' ]; then image="elasticsearch-oss:$target"; fi + docker pull "$image" + echo docker run --restart=always -d --name="$name" --network="$network" --ip="$ES_IP" "$mounts" "$image" | bash # check status wait_for_online local version=$(test_version) @@ -319,13 +323,13 @@ upgrade_classic() brew update case "$target" in "2.4") - brew install homebrew/versions/elasticsearch24 + brew install elasticsearch@2.4 ;; "5.6") - brew install homebrew/versions/elasticsearch56 + brew install elasticsearch@5.6 ;; "6.2") - brew install homebrew/versions/elasticsearch62 + brew install elasticsearch ;; esac ;;