Merge branch 'feature/docker-file' into develop

docker/Dockerfile

@@ -12,15 +12,13 @@ RUN git clone --depth 1 https://github.com/bluemir/wikinote.git src && rm -rf sr
 
 WORKDIR /wikinote/src
 #RUN
-RUN ["/bin/bash", "--login", "-c", "npm install"]
+RUN npm install
 
 ##configuration
-ADD local.yaml /wikinote/src/config/
-
 COPY entry.sh /wikinote/src/
 
 VOLUME ["/wikinote/data"]
 
 EXPOSE 4000
-CMD ["/bin/bash", "--login", "-c", "./entry.sh"]
+CMD ["./entry.sh"]
 

docker/entry.sh

@@ -6,9 +6,22 @@ if [ ! -d /wikinote/data/.git ]; then
 		git init && \
 		git config user.name anonymous && \
 		git config user.email anonymous@wikinote && \
-		git commit -m "Initial commit" --allow-empty
+		git commit -m "Initial commit" --allow-empty && \
+		echo ".app/" >> .gitignore
 fi
 
-cd /wikinote/src && \
-	node wikinote.js
+if [ ! -f /wikinote/data/.app/config.yaml ]; then
+	cd /wikinote/src && \
+		node wikinote.js  \
+			--port 4000 \
+			--wikinote-path /wikinote/data \
+			--wikiname WikiNote \
+			--front-page front-page \
+			--save
+else
+	cd /wikinote/src && \
+		node wikinote.js \
+			--port 4000 \
+			--wikinote-path /wikinote/data
+fi