[HSEARCH] hsearch-elasticsearch-wikipedia: use docker-compose to set up the environment

Author: yrodiere

hibernate-search/hsearch-elasticsearch-wikipedia/README.md

@@ -1,26 +1,22 @@
 # Setting up the environment
 
-## Database
+## Services
 
-Install postgresql and configure it.
+Install docker and docker-compose, then run this from the root of the project:
 
-* One-liner with docker:
-  ```
-  sudo docker run --name postgresql-hibernate_demo -e POSTGRES_PASSWORD=hibernate_demo -e POSTGRES_USER=hibernate_demo -e POSTGRES_DB=hsearch_es_wikipedia -p 5432:5432 -d postgres:11.1
-  ```
-* Otherwise, for Fedora, [see here](https://fedoraproject.org/wiki/PostgreSQL)).
-You will need to enable the `md5` authentication scheme for the local network connection,
-and to create a `hibernate_demo` user with the password `hibernate_demo`.
-
-## Data
+```
+sudo docker-compose -f environment-stack.yml -p hsearch-elasticsearch-wikipedia up
+```
 
-You can try a fully automated initialization using this command:
+You can later remove the created services and volumes with this command:
 
 ```
-./src/init/init -d postgresql-hibernate_demo
+sudo docker-compose -f environment-stack.yml -p hsearch-elasticsearch-wikipedia down -v
 ```
 
-Or, if not using docker:
+## Data
+
+You can try a fully automated initialization using this command:
 
 ```
 ./src/init/init
@@ -44,22 +40,9 @@ bunzip2 <the dump>
 Initialize the database using the provided script:
 
 ```
-./src/init/init <the uncompressed dump>
+./src/init/init -f <path to the uncompressed dump>
 ```
 
-The script will ask for a password: just use `hibernate_demo`.
-
-## Elasticsearch
-
-Ensure you have an Elasticsearch 5 instance running and accessible from <http://localhost:9200/>:
-
-* One-liner using temporary storage with docker (ES6, but it should work for this demo):
-  ```
-  sudo docker run --ulimit memlock=-1:-1 -ti --tmpfs /run --tmpfs=/opt/elasticsearch/volatile/data:uid=1000 --tmpfs=/opt/elasticsearch/volatile/logs:uid=1000 -p 9200:9200 -p 9300:9300 --name es-it sanne/elasticsearch-light-testing
-  ```
-* Otherwise, you can download Elasticsearch from here: <https://www.elastic.co/downloads/elasticsearch>.
-Unzip the downloaded file, and just run `bin/elasticsearch` to start an instance on <http://localhost:9200>.
-
 # Running the project
 
 You must have [Maven (`mvn`)](https://maven.apache.org/) in your path, version 3.2 or later.

hibernate-search/hsearch-elasticsearch-wikipedia/environment-stack.yml

@@ -0,0 +1,57 @@
+version: '3.1'
+services:
+  db:
+    image: postgres:11.1
+    environment:
+      - POSTGRES_USER=hibernate_demo
+      - POSTGRES_PASSWORD=hibernate_demo
+      - POSTGRES_DB=hsearch_es_wikipedia
+    volumes:
+      - postgresdata1:/var/lib/postgresql/data
+    ports:
+      - 5432:5432
+    networks:
+      - postgresnet
+  elasticsearch1:
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.5.4
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    volumes:
+      - esdata1:/usr/share/elasticsearch/data
+    ports:
+      - 9200:9200
+    networks:
+      - esnet
+  elasticsearch2:
+    image: docker.elastic.co/elasticsearch/elasticsearch:6.5.4
+    environment:
+      - cluster.name=docker-cluster
+      - bootstrap.memory_lock=true
+      - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+      - "discovery.zen.ping.unicast.hosts=elasticsearch1"
+    ulimits:
+      memlock:
+        soft: -1
+        hard: -1
+    volumes:
+      - esdata2:/usr/share/elasticsearch/data
+    networks:
+      - esnet
+
+volumes:
+  postgresdata1:
+    driver: local
+  esdata1:
+    driver: local
+  esdata2:
+    driver: local
+
+networks:
+  esnet:
+  postgresnet:

hibernate-search/hsearch-elasticsearch-wikipedia/src/init/init

@@ -20,43 +20,44 @@ function guess_remote_dump_url() {
 }
 
 function do_psql() {
-	if [ -n "$DOCKER_CONTAINER_NAME" ]
+	local options="--link "$DOCKER_CONTAINER_NAME":postgres -e PGPASSWORD=hibernate_demo"
+	if [ -n "$DOCKER_NETWORK_NAME" ]
 	then
-		sudo -p "Sudo password (to execute docker): " docker run -i --rm --link "$DOCKER_CONTAINER_NAME":postgres -e PGPASSWORD=hibernate_demo postgres:11.1 psql -h postgres -U hibernate_demo hsearch_es_wikipedia
-	else
-		PGPASSWORD=hibernate_demo psql -U hibernate_demo -h localhost -W hsearch_es_wikipedia
+		options+=" --net $DOCKER_NETWORK_NAME"
 	fi
+	sudo -p "Sudo password (to execute docker): " docker run -i --rm $options postgres:11.1 psql -h postgres -U hibernate_demo hsearch_es_wikipedia
 }
 
 
 which xsltproc 1>/dev/null 2>&1 || abort "Command 'xsltproc' isn't in the \$PATH; please install the command or add it to the \$PATH."
 
-while getopts 'd:' opt
+DOCKER_CONTAINER_NAME="hsearch-elasticsearch-wikipedia_db_1"
+DOCKER_NETWORK_NAME="hsearch-elasticsearch-wikipedia_postgresnet"
+LOCAL_DUMP_FILE=
+while getopts 'c:n:f:' opt
 do
         case "$opt" in
-                d)
+                c)
 			DOCKER_CONTAINER_NAME="$OPTARG"
-			log "Will attempt to connect to docker container with name '$DOCKER_CONTAINER_NAME'"
                         ;;
+                n)
+			DOCKER_NETWORK_NAME="$OPTARG"
+                        ;;
+		f)
+			LOCAL_DUMP_FILE="$OPTARG"
+			;;
                 \?)
                         exit 1
                         ;;
         esac
 done
-
 shift $(( OPTIND - 1 ))
 
-if [ -z "$DOCKER_CONTAINER_NAME" ]
-then
-	log "No docker container name given (-d option missing). Will attempt to use a local 'psql' command."
-	which "psql" 1>/dev/null 2>&1 || abort "Command 'psql' isn't in the \$PATH; please install the command or add it to the \$PATH."
-fi
-
-LOCAL_DUMP_FILE=$1
+log "Will attempt to connect to docker container with name '$DOCKER_CONTAINER_NAME' within network '$DOCKER_NETWORK_NAME'"
 
 if [ -z "$LOCAL_DUMP_FILE" ]
 then
-	log "No argument given; will try to retrieve the dump file automatically."
+	log "No dump file path given; will try to retrieve the dump file automatically."
 	LOCAL_DUMP_DIR="/tmp/hsearch_es_wikipedia"
 	LOCAL_DUMP_FILE="$LOCAL_DUMP_DIR/enwiki-latest-pages-meta-current1.xml"