Merge pull request #3695 from xzkostyan/feature-docker-entrypoint-initdb.d

Add docker-entrypoint-initdb.d support

docker/server/Dockerfile

@@ -24,6 +24,8 @@ RUN apt-get update \
         /tmp/* \
     && apt-get clean
 
+RUN mkdir /docker-entrypoint-initdb.d
+
 COPY docker_related_config.xml /etc/clickhouse-server/config.d/
 COPY entrypoint.sh /entrypoint.sh
 ADD https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64 /bin/gosu

docker/server/README.md

@@ -33,6 +33,22 @@ ClickHouse configuration represented with a file "config.xml" ([documentation](h
 $ docker run -d --name some-clickhouse-server --ulimit nofile=262144:262144 -v /path/to/your/config.xml:/etc/clickhouse-server/config.xml yandex/clickhouse-server
 ```
 
+## How to extend this image
+
+If you would like to do additional initialization in an image derived from this one, add one or more `*.sql`, `*.sql.gz`, or `*.sh` scripts under `/docker-entrypoint-initdb.d`. After the entrypoint calls `initdb` it will run any `*.sql` files, run any executable `*.sh` scripts, and source any non-executable `*.sh` scripts found in that directory to do further initialization before starting the service.
+
+For example, to add an additional user and database, add the following to `/docker-entrypoint-initdb.d/init-db.sh`:
+
+```bash
+#!/bin/bash
+set -e
+
+clickhouse client -n <<-EOSQL
+	CREATE DATABASE docker;
+	CREATE TABLE docker.docker (x Int32) ENGINE = Log;
+EOSQL
+```
+
 ## License
 
 View [license information](https://github.com/yandex/ClickHouse/blob/master/LICENSE) for the software contained in this image.

docker/server/entrypoint.sh

@@ -30,6 +30,36 @@ chown -R $USER:$GROUP \
     "$TMP_DIR" \
     "$USER_PATH"
 
+if [ -n "$(ls /docker-entrypoint-initdb.d/)" ]; then
+    gosu clickhouse /usr/bin/clickhouse-server --config-file=$CLICKHOUSE_CONFIG &
+    pid="$!"
+    sleep 1
+
+    clickhouseclient=( clickhouse client --multiquery )
+    echo
+    for f in /docker-entrypoint-initdb.d/*; do
+        case "$f" in
+            *.sh)
+                if [ -x "$f" ]; then
+                    echo "$0: running $f"
+                    "$f"
+                else
+                    echo "$0: sourcing $f"
+                    . "$f"
+                fi
+                ;;
+            *.sql)    echo "$0: running $f"; cat "$f" | "${clickhouseclient[@]}" ; echo ;;
+            *.sql.gz) echo "$0: running $f"; gunzip -c "$f" | "${clickhouseclient[@]}"; echo ;;
+            *)        echo "$0: ignoring $f" ;;
+        esac
+        echo
+    done
+
+    if ! kill -s TERM "$pid" || ! wait "$pid"; then
+        echo >&2 'ClickHouse init process failed.'
+        exit 1
+    fi
+fi
 
 # if no args passed to `docker run` or first argument start with `--`, then the user is passing clickhouse-server arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then