Merge pull request #775 from stephenmoloney/devel-local

update docker compose

Dockerfile

@@ -1,13 +1,21 @@
 FROM debian:wheezy
 MAINTAINER wefork
 
+# Declare Arguments
+ARG NODE_VERSION
+ARG METEOR_RELEASE
+ARG NPM_VERSION
+ARG ARCHITECTURE
+ARG SRC_PATH
+
+# Set the environment variables (defaults where required)
 ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates"
 ENV GOSU_VERSION=1.10
-ARG NODE_VERSION=v0.10.48
-ARG METEOR_RELEASE=1.3.5.1
-ARG NPM_VERSION=3.10.10
-ARG ARCHITECTURE=linux-x64
-ARG SRC_PATH=./
+ENV NODE_VERSION ${NODE_VERSION:-v0.10.48}
+ENV METEOR_RELEASE ${METEOR_RELEASE:-1.3.5.1}
+ENV NPM_VERSION ${NPM_VERSION:-3.10.10}
+ENV ARCHITECTURE ${ARCHITECTURE:-linux-x64}
+ENV SRC_PATH ${SRC_PATH:-./}
 
 # Copy the app to the image
 COPY ${SRC_PATH} /home/wekan/app

README.md

@@ -50,9 +50,31 @@ that by providing one-click installation on various platforms.
 
 [VirtualBox][virtualbox]
 
-Docker: [Docker image][docker_image], [Docs][docker_docs], [Docker Nginx proxy][docker_nginxproxy], [Docker Issue][docker_issue]
+### Docker: [Docker image][docker_image], [Docs][docker_docs], [Docker Nginx proxy][docker_nginxproxy], [Docker Issue][docker_issue]
 
-Docker example, running latest Wekan:
+Docker example, running latest Wekan using docker-compose:
+
+#### Running from remote dockerhub images
+```
+sudo docker-compose pull & sudo docker-compose up -d --no-build
+```
+
+#### Running from locally built dockerhub images
+```
+sudo docker-compose up -d --build
+```
+
+#### Running from locally built dockerhub images and modified `ARG` variables (not recommended)
+```
+echo 'NODE_VERSION=v6.6.0' >> .env && \
+echo 'METEOR_RELEASE=1.4.2.3' >> .env && \
+echo 'NPM_VERSION=4.1.2' >> .env && \
+echo 'ARCHITECTURE=linux-x64' >> .env && \
+echo 'SRC_PATH=./' >> .env && \
+sudo docker-compose up -d --build
+```
+
+Docker example, running latest Wekan using docker run commands alone:
 ```
 docker run -d --restart=always --name wekan-db mongo:3.2.11
 

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - wekan-db-dump:/dump
 
   wekan:
-    image: wefork/wekan
+    image: mquandalle/wekan:latest
     container_name: wekan-app
     restart: always
     networks: