diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-02-02 19:36:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-02 19:36:33 +0200 |
| commit | 3a574901bb1cd25791b9583f0b1ca9412a5addcc (patch) | |
| tree | 15e4f783d69ae9b08bd7ae4ff43ed2fb122de4ce | |
| parent | 1ec25c2a52d3bbe4c1613a6f818944aeea19a332 (diff) | |
| parent | 9909e72727029f7a80128b91c9ee2f569f72ba91 (diff) | |
| download | wekan-3a574901bb1cd25791b9583f0b1ca9412a5addcc.tar.gz wekan-3a574901bb1cd25791b9583f0b1ca9412a5addcc.tar.bz2 wekan-3a574901bb1cd25791b9583f0b1ca9412a5addcc.zip | |
Merge pull request #775 from stephenmoloney/devel-local
update docker compose
| -rw-r--r-- | Dockerfile | 18 | ||||
| -rw-r--r-- | README.md | 26 | ||||
| -rw-r--r-- | docker-compose.yml | 2 |
3 files changed, 38 insertions, 8 deletions
@@ -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 @@ -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 diff --git a/docker-compose.yml b/docker-compose.yml index 819ef430..35c5bfd1 100644 --- a/docker-compose.yml +++ b/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: |