diff --git a/.github/workflows/pythonpackage.yml b/.github/workflows/pythonpackage.yml index fc4d4923f..b788f1ce2 100644 --- a/.github/workflows/pythonpackage.yml +++ b/.github/workflows/pythonpackage.yml @@ -17,7 +17,7 @@ jobs: matrix: python-version: [3.6, 3.7] mm-extras: ["true", "false"] - es_version: [5.6.16, 6.8.10, 7.7.1] + es_version: [5.6.16, 6.8.22, 7.16.2] steps: - uses: actions/checkout@v2 diff --git a/docker_containers/mindmeld_dep_docker/Dockerfile b/docker_containers/mindmeld_dep_docker/Dockerfile index 9c8f61206..d393bb48a 100644 --- a/docker_containers/mindmeld_dep_docker/Dockerfile +++ b/docker_containers/mindmeld_dep_docker/Dockerfile @@ -10,8 +10,8 @@ # Pull base image. FROM ubuntu:18.04 -ENV ES_PKG_NAME elasticsearch-7.8.0-linux-x86_64 -ENV ES_FOLDER_NAME elasticsearch-7.8.0 +ENV ES_PKG_NAME elasticsearch-7.16.2-linux-x86_64 +ENV ES_FOLDER_NAME elasticsearch-7.16.2 # System packages RUN apt-get update && \ diff --git a/docker_containers/mindmeld_docker/Dockerfile b/docker_containers/mindmeld_docker/Dockerfile index 3a9484294..b00a74628 100644 --- a/docker_containers/mindmeld_docker/Dockerfile +++ b/docker_containers/mindmeld_docker/Dockerfile @@ -10,8 +10,8 @@ # Pull base image. FROM ubuntu:18.04 -ENV ES_PKG_NAME elasticsearch-7.8.0-linux-x86_64 -ENV ES_FOLDER_NAME elasticsearch-7.8.0 +ENV ES_PKG_NAME elasticsearch-7.16.2-linux-x86_64 +ENV ES_FOLDER_NAME elasticsearch-7.16.2 # System packages RUN apt-get update && \ diff --git a/scripts/mindmeld_init.sh b/scripts/mindmeld_init.sh index 15b098039..5e5445020 100755 --- a/scripts/mindmeld_init.sh +++ b/scripts/mindmeld_init.sh @@ -145,7 +145,7 @@ function check_os_and_execute_deps() { if [[ ($command == "elasticsearch") && ($is_200_ok == 0) ]]; then echo no echo " " starting elasticsearch ... - sudo docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.8.0 + sudo docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.16.2 else echo yes fi @@ -197,8 +197,8 @@ function check_os_and_execute_deps() { elif [[ $command == "pip" ]]; then sudo apt install python-pip elif [[ $command == "elasticsearch" && NEEDS_ES_DEP_INSTALL == 1 ]]; then - sudo docker pull docker.elastic.co/elasticsearch/elasticsearch:7.8.0 - sudo docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.8.0 + sudo docker pull docker.elastic.co/elasticsearch/elasticsearch:7.16.2 + sudo docker run -d -p 9200:9200 -p 9300:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.16.2 elif [[ $command == "virtualenv" ]]; then sudo apt install virtualenv fi