[HSEARCH] Allow to use docker for the hsearch-elasticsearch-wikipedia demo

Author: yrodiere

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

@@ -2,42 +2,30 @@
 
 ## Database
 
-Install postgresql and configure it ([see here for Fedora](https://fedoraproject.org/wiki/PostgreSQL)).
+Install postgresql and configure it.
 
-Create a database and user:
+* 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`.
 
-```
-# From a shell
-sudo -i -u postgres
-createuser -U postgres -P hibernate_demo # When prompted, use "hibernate_demo" as a password
-createdb -U postgres -O hibernate_demo hsearch_es_wikipedia
-```
-
-You need to enable the `md5` authentication scheme for the local network connection.
+## Data
 
-So, if you just installed PostgreSQL, you should make your `/var/lib/pgsql/data/pg_hba.conf` file look like:
-```
-local   all             all                                     peer
-host    all             all             127.0.0.1/32            md5
-host    all             all             ::1/128                 md5
-```
-(just change `ident` to `md5` in the existing lines)
+You can try a fully automated initialization using this command:
 
-Don't forget to reload your PostgreSQL server after this change:
 ```
-sudo systemctl reload postgresql
+./src/init/init -d postgresql-hibernate_demo
 ```
 
-## Data
-
-You can try a fully automated initialization using this command:
+Or, if not using docker:
 
 ```
 ./src/init/init
 ```
 
-The script will ask for a password: just use `hibernate_demo`.
-
 If this succeeds, you're all set, you can go to the next step.
 
 Otherwise, Wikipedia's dumps page structure probably changed, but you can proceed as explained below.
@@ -63,9 +51,13 @@ 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/>.
+Ensure you have an Elasticsearch 5 instance running and accessible from <http://localhost:9200/>:
 
-You can download Elasticsearch from here: <https://www.elastic.co/downloads/elasticsearch>.
+* 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

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

@@ -19,10 +19,58 @@ function guess_remote_dump_url() {
 		|| abort "Could not guess the URL to get the remote dump from."
 }
 
-LOCAL_DUMP_FILE=$1
+function do_psql() {
+	if [ -n "$DOCKER_CONTAINER_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
+	fi
+}
+
 
 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
+do
+        case "$opt" in
+                d)
+			DOCKER_CONTAINER_NAME="$OPTARG"
+			log "Will attempt to connect to docker container with name '$DOCKER_CONTAINER_NAME'"
+                        ;;
+                h)
+                        FEATURE=git_history
+                        ;;
+                f)
+                        case "$OPTARG" in
+                                "api"|"spi"|"public"|"impl"|"test"|"main"|"all")
+                                        FILTER="$OPTARG"
+                                        ;;
+                                *)
+                                        echo 2>&1 "Unrecognized source filter: $OPTARG"
+                                        exit 1
+                                        ;;
+                        esac
+                        ;;
+                i)
+                        INTERNAL_PACKAGE_MARKER="$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
+
 if [ -z "$LOCAL_DUMP_FILE" ]
 then
 	log "No argument given; will try to retrieve the dump file automatically."
@@ -48,5 +96,5 @@ fi
 
 DIR=$(readlink -f "$0" | xargs dirname)
 
-xsltproc "$DIR/sql_populate.xslt" $LOCAL_DUMP_FILE | psql -U hibernate_demo -h localhost -W hsearch_es_wikipedia
+xsltproc "$DIR/sql_populate.xslt" $LOCAL_DUMP_FILE | do_psql