Merge pull request #81 from RoBobik/fix-docker-entrypoint

Fix Docker entrypoint not finding existing instance data

.docker/docker-entrypoint.sh

@@ -1,6 +1,9 @@
-#!/bin/bash -e
+#!/bin/bash -eu
 
-if [ ! -d $INSTANCE_DIR/config ]; then
+# This file is created during Docker build and should always be present
+INSTANCE_DIR="$(</opt/wrends/instance.loc)"
+
+if [ ! -d "$INSTANCE_DIR/config" ]; then
   source ./bootstrap/setup.sh
   echo "First start..."
   first_start

Dockerfile

@@ -56,7 +56,7 @@ ENV PATH="${PATH}:/opt/wrends/bin"
 # Prepare Wren:DS instance directory
 ARG INSTANCE_DIR="/opt/wrends/instance"
 RUN echo ${INSTANCE_DIR} > /opt/wrends/instance.loc
-RUN mkdir -p ${INSTANCE_DIR} ${INSTANCE_DIR}/lib/extension
+RUN mkdir -p ${INSTANCE_DIR} ${INSTANCE_DIR}/lib/extensions
 VOLUME ${INSTANCE_DIR}
 
 EXPOSE ${LDAP_PORT} ${LDAPS_PORT} ${ADMIN_CONNECTOR_PORT}