Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Elasticsearch dependency. #386

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update Elasticsearch dependency. #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d21532e
Update Elasticsearch dependency.
tmehlinger Dec 20, 2021
1ff40df
update ES in mindmeld_init.sh
tmehlinger Dec 20, 2021
c5c63b5
update ES versions in actions config
tmehlinger Dec 20, 2021
5bae635
update ES in mindmeld_docker/Dockerfile
tmehlinger Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pythonpackage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker_containers/mindmeld_dep_docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
4 changes: 2 additions & 2 deletions docker_containers/mindmeld_docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
6 changes: 3 additions & 3 deletions scripts/mindmeld_init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down