diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-09-19 19:18:53 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-09-19 19:18:53 +0300 |
| commit | 1bad81ca86ca87c02148764cc03a3070882a8a33 (patch) | |
| tree | 4adb9cc9452b669f328cd9f77dc1e6ded28275e5 /Dockerfile | |
| parent | 60ffe5ab9b942325d5154c4fb2766ef665be03ac (diff) | |
| download | wekan-1bad81ca86ca87c02148764cc03a3070882a8a33.tar.gz wekan-1bad81ca86ca87c02148764cc03a3070882a8a33.tar.bz2 wekan-1bad81ca86ca87c02148764cc03a3070882a8a33.zip | |
- Fix Dockerfile Meteor install by changing tar to bsdtar.
Thanks to maurice-schleussinger and xet7 !
Closes #1900
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 16 |
1 files changed, 13 insertions, 3 deletions
@@ -28,7 +28,7 @@ ARG OAUTH2_TOKEN_ENDPOINT # Set the environment variables (defaults where required) # DOES NOT WORK: paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # ENV BUILD_DEPS="paxctl" -ENV BUILD_DEPS="apt-utils gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \ +ENV BUILD_DEPS="apt-utils bsdtar gnupg gosu wget curl bzip2 build-essential python git ca-certificates gcc-7" \ NODE_VERSION=v8.12.0 \ METEOR_RELEASE=1.6.0.1 \ USE_EDGE=false \ @@ -62,6 +62,11 @@ RUN \ # OS dependencies apt-get update -y && apt-get install -y --no-install-recommends ${BUILD_DEPS} && \ \ + # Meteor installer doesn't work with the default tar binary, so using bsdtar while installing. + # https://github.com/coreos/bugs/issues/1095#issuecomment-350574389 + cp $(which tar) $(which tar)~ && \ + ln -sf $(which bsdtar) $(which tar) && \ + \ # Download nodejs wget https://nodejs.org/dist/${NODE_VERSION}/node-${NODE_VERSION}-${ARCHITECTURE}.tar.gz && \ wget https://nodejs.org/dist/${NODE_VERSION}/SHASUMS256.txt.asc && \ @@ -123,8 +128,10 @@ RUN \ # Change user to wekan and install meteor cd /home/wekan/ && \ chown wekan:wekan --recursive /home/wekan && \ - curl https://install.meteor.com -o /home/wekan/install_meteor.sh && \ - sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \ + curl "https://install.meteor.com/?release=${METEOR_RELEASE}" -o /home/wekan/install_meteor.sh && \ + # OLD: sed -i "s|RELEASE=.*|RELEASE=${METEOR_RELEASE}\"\"|g" ./install_meteor.sh && \ + # Install Meteor forcing its progress + sed -i 's/VERBOSITY="--silent"/VERBOSITY="--progress-bar"/' ./install_meteor.sh && \ echo "Starting meteor ${METEOR_RELEASE} installation... \n" && \ chown wekan:wekan /home/wekan/install_meteor.sh && \ \ @@ -163,6 +170,9 @@ RUN \ #gosu wekan:wekan npm install bcrypt && \ mv /home/wekan/app_build/bundle /build && \ \ + # Put back the original tar + mv $(which tar)~ $(which tar) && \ + \ # Cleanup apt-get remove --purge -y ${BUILD_DEPS} && \ apt-get autoremove -y && \ |