summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-08-07 03:05:28 +0300
committerLauri Ojansivu <x@xet7.org>2019-08-07 03:05:28 +0300
commit1fc3a1db2e663f149287b6e14053d536fb1a8a81 (patch)
treee6c6d7d8dacf150a2e6a383e6f04223bb4d7d0a5
parent972e7a9971430b202d30011d0052342d3423ef47 (diff)
downloadwekan-1fc3a1db2e663f149287b6e14053d536fb1a8a81.tar.gz
wekan-1fc3a1db2e663f149287b6e14053d536fb1a8a81.tar.bz2
wekan-1fc3a1db2e663f149287b6e14053d536fb1a8a81.zip
Try to make release sizes smaller by deleting phantomjs.
Thanks to xet7 !
-rw-r--r--Dockerfile5
-rwxr-xr-xreleases/delete-phantomjs.sh3
-rw-r--r--releases/release-bundle.sh7
-rw-r--r--snapcraft.yaml3
-rwxr-xr-xstacksmith/user-scripts/build.sh4
5 files changed, 22 insertions, 0 deletions
diff --git a/Dockerfile b/Dockerfile
index 17eccf5d..7d440e3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -257,6 +257,11 @@ RUN \
#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 npm install bcrypt && \
+ #
+ # Delete phantomjs
+ cd /home/wekan/app_build/bundle && \
+ find . -name "*phantomjs*" | xargs rm -rf && \
+ #
cd /home/wekan/app_build/bundle/programs/server/ && \
gosu wekan:wekan npm install && \
#gosu wekan:wekan npm install bcrypt && \
diff --git a/releases/delete-phantomjs.sh b/releases/delete-phantomjs.sh
new file mode 100755
index 00000000..5fb85e10
--- /dev/null
+++ b/releases/delete-phantomjs.sh
@@ -0,0 +1,3 @@
+cd ~/repos/wekan/.build
+find . -name "*phantomjs*" | xargs rm -rf
+cd ~/repos/wekan
diff --git a/releases/release-bundle.sh b/releases/release-bundle.sh
new file mode 100644
index 00000000..4654c362
--- /dev/null
+++ b/releases/release-bundle.sh
@@ -0,0 +1,7 @@
+cd ~/repos/wekan
+./rebuild-wekan.sh
+./releases/delete-phantomjs.sh
+cd ~/repos/wekan/.build
+zip -r wekan-$1.zip bundle
+scp wekan-$1.zip x2:/var/snap/wekan/common/releases.wekan.team/
+cd ..
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 7347800d..531a92ec 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -203,6 +203,9 @@ parts:
meteor npm install --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
+ cd .build
+ find . -name "*phantomjs*" | xargs rm -rf
+ cd ..
#Removed binary version of bcrypt because of security vulnerability that is not fixed yet.
#https://github.com/wekan/wekan/commit/4b2010213907c61b0e0482ab55abb06f6a668eac
#https://github.com/wekan/wekan/commit/7eeabf14be3c63fae2226e561ef8a0c1390c8d3c
diff --git a/stacksmith/user-scripts/build.sh b/stacksmith/user-scripts/build.sh
index 7ed9de79..c0ebf185 100755
--- a/stacksmith/user-scripts/build.sh
+++ b/stacksmith/user-scripts/build.sh
@@ -79,4 +79,8 @@ sudo rm /home/wekan/app_build/bundle/programs/server/npm/node_modules/meteor/raj
cd /home/wekan/app_build/bundle/programs/server/
sudo npm install
sudo chown -R wekan:wekan ./node_modules
+
+cd /home/wekan/app_build/bundle
+find . -name "*phantomjs*" | sudo xargs rm -rf
+
sudo mv /home/wekan/app_build/bundle /build