Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Try to fix Docker and Snap: add apt-utils, remove sed bson.

Browse source
This commit is contained in:
Lauri Ojansivu 2018-01-22 14:37:34 +02:00
parent fb220fe918
commit d79bb1a81c
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Dockerfile
View file

@ -13,7 +13,7 @@ ARG SRC_PATH
# Set the environment variables (defaults where required) # Set the environment variables (defaults where required)
# paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303 # paxctl fix for alpine linux: https://github.com/wekan/wekan/issues/1303
ENV BUILD_DEPS="wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl" ENV BUILD_DEPS="apt-utils wget curl bzip2 build-essential python git ca-certificates gcc-4.9 paxctl"
ENV GOSU_VERSION=1.10 ENV GOSU_VERSION=1.10
ENV NODE_VERSION ${NODE_VERSION:-v8.9.3} ENV NODE_VERSION ${NODE_VERSION:-v8.9.3}
ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1} ENV METEOR_RELEASE ${METEOR_RELEASE:-1.6.0.1}
@ -119,7 +119,6 @@ RUN \
gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \ gosu wekan:wekan /home/wekan/.meteor/meteor build --directory /home/wekan/app_build && \
cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ cp /home/wekan/app/fix-download-unicode/cfs_access-point.txt /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \ chown wekan:wekan /home/wekan/app_build/bundle/programs/server/packages/cfs_access-point.js && \
gosu wekan:wekan sed -i "s|build\/Release\/bson|browser_build\/bson|g" /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js && \
cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \ cd /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt && \
gosu wekan:wekan rm -rf node_modules/bcrypt && \ gosu wekan:wekan rm -rf node_modules/bcrypt && \
gosu wekan:wekan npm install bcrypt && \ gosu wekan:wekan npm install bcrypt && \

2
snapcraft.yaml
View file

@ -77,6 +77,7 @@ parts:
- node-pre-gyp - node-pre-gyp
- fibers@2.0.0 - fibers@2.0.0
build-packages: build-packages:
- apt-utils
- ca-certificates - ca-certificates
- python - python
- g++ - g++
@ -107,7 +108,6 @@ parts:
meteor npm install --allow-superuser meteor npm install --allow-superuser
meteor build .build --directory --allow-superuser meteor build .build --directory --allow-superuser
cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/packages/cfs_access-point.js
sed -i "s|build\/Release\/bson|browser_build\/bson|g" .build/bundle/programs/server/npm/node_modules/meteor/cfs_gridfs/node_modules/mongodb/node_modules/bson/ext/index.js
cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt cd .build/bundle/programs/server/npm/node_modules/meteor/npm-bcrypt
rm -rf node_modules/bcrypt rm -rf node_modules/bcrypt
meteor npm install --save bcrypt meteor npm install --save bcrypt