diff options
| author | Lauri Ojansivu <x@xet7.org> | 2019-04-20 16:51:57 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2019-04-20 16:51:57 +0300 |
| commit | 02819ca16969b103493ebdd9a66f058995421507 (patch) | |
| tree | a3352b65083c79ab733db2b99e7c4f0a1276277e /Dockerfile | |
| parent | 53d42a17ffbc6466d2d422dfdcbd867ea31fe082 (diff) | |
| parent | a5122cc0764b57a163c3e8ca3e00e703669a98db (diff) | |
| download | wekan-02819ca16969b103493ebdd9a66f058995421507.tar.gz wekan-02819ca16969b103493ebdd9a66f058995421507.tar.bz2 wekan-02819ca16969b103493ebdd9a66f058995421507.zip | |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 30 |
1 files changed, 16 insertions, 14 deletions
@@ -1,4 +1,4 @@ -FROM ubuntu:cosmic +FROM ubuntu:disco LABEL maintainer="wekan" # Set the environment variables (defaults where required) @@ -6,7 +6,7 @@ LABEL maintainer="wekan" # ENV BUILD_DEPS="paxctl" ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python python3 python3-distutils git ca-certificates gcc-7" \ DEBUG=false \ - NODE_VERSION=v8.15.1 \ + NODE_VERSION=v8.16.0 \ METEOR_RELEASE=1.6.0.1 \ USE_EDGE=false \ METEOR_EDGE=1.5-beta.17 \ @@ -191,18 +191,20 @@ RUN \ fi; \ \ # Get additional packages - mkdir -p /home/wekan/app/packages && \ + #mkdir -p /home/wekan/app/packages && \ chown wekan:wekan --recursive /home/wekan && \ - cd /home/wekan/app/packages && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/flow-router.git kadira-flow-router && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-cas.git && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-ldap.git && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/wekan-scrollbar.git && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/wekan/meteor-accounts-oidc.git && \ - gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan_accounts-oidc && \ - gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan_oidc && \ - gosu wekan:wekan rm -rf meteor-accounts-oidc && \ + # REPOS BELOW ARE INCLUDED TO WEKAN REPO + #cd /home/wekan/app/packages && \ + #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/flow-router.git kadira-flow-router && \ + #gosu wekan:wekan git clone --depth 1 -b master https://github.com/meteor-useraccounts/core.git meteor-useraccounts-core && \ + #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-cas.git && \ + #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-ldap.git && \ + #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/wekan-scrollbar.git && \ + #gosu wekan:wekan git clone --depth 1 -b master https://github.com/wekan/meteor-accounts-oidc.git && \ + #gosu wekan:wekan git clone --depth 1 -b master --recurse-submodules https://github.com/wekan/markdown.git && \ + #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_accounts-oidc wekan-accounts-oidc && \ + #gosu wekan:wekan mv meteor-accounts-oidc/packages/switch_oidc wekan-oidc && \ + #gosu wekan:wekan rm -rf meteor-accounts-oidc && \ sed -i 's/api\.versionsFrom/\/\/api.versionsFrom/' /home/wekan/app/packages/meteor-useraccounts-core/package.js && \ cd /home/wekan/.meteor && \ gosu wekan:wekan /home/wekan/.meteor/meteor -- help; \ @@ -212,7 +214,7 @@ RUN \ mkdir -p /home/wekan/python && \ chown wekan:wekan --recursive /home/wekan/python && \ cd /home/wekan/python && \ - gosu wekan:wekan git clone --depth 1 -b master git://github.com/Kronuz/esprima-python && \ + gosu wekan:wekan git clone --depth 1 -b master https://github.com/Kronuz/esprima-python && \ cd /home/wekan/python/esprima-python && \ python3 setup.py install --record files.txt && \ cd /home/wekan/app &&\ |