Merge branch 'hotfix/1.2.2'

cancerit · Jun 27, 2017 · 0efaee0 · 0efaee0
2 parents 15645ed + b4e724f
commit 0efaee0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/scripts/pbuild.sh b/scripts/pbuild.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CGP_DS_VERSION=1.2.1
+CGP_DS_VERSION=1.2.2
 
 set -ue
 

diff --git a/scripts/trusty/build.sh b/scripts/trusty/build.sh
@@ -48,6 +48,10 @@ sudo ln -s /opt/dockstore/dockstore /usr/local/bin/dockstore
 sudo -u ubuntu mkdir -p /home/ubuntu/.dockstore
 sudo -u ubuntu bash -c 'echo "token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 server-url: https://dockstore.org:8443
+
+[dockstore-file-s3cmd-plugin]
+client = /usr/local/bin/s3cmd
+config-file-location = /home/ubuntu/.s3cfg
 " > /home/ubuntu/.dockstore/config'
 # plugins we want:
 sudo -u ubuntu bash -c 'echo "[{

diff --git a/scripts/xenial/build.sh b/scripts/xenial/build.sh
@@ -48,6 +48,10 @@ sudo ln -s /opt/dockstore/dockstore /usr/local/bin/dockstore
 sudo -u ubuntu mkdir -p /home/ubuntu/.dockstore
 sudo -u ubuntu bash -c 'echo "token: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 server-url: https://dockstore.org:8443
+
+[dockstore-file-s3cmd-plugin]
+client = /usr/local/bin/s3cmd
+config-file-location = /home/ubuntu/.s3cfg
 " > /home/ubuntu/.dockstore/config'
 # plugins we want:
 sudo -u ubuntu bash -c 'echo "[{