Merge branch 'hotfix/1.2.3'

cancerit · Jul 19, 2017 · 95ca215 · 95ca215
2 parents 0efaee0 + 3acca8f
commit 95ca215
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,14 @@
+### 1.2.3
+* Update dockstore version to 1.2.5
+* Fix #3 s3cmd plugin updated to 0.0.6
+
+### 1.2.2
+Added missing config to ~/.dockstore/config to allow use of s3cmd plugin "out-of-the-box".
+
+### 1.2.1
+* Corrects the URL embedded in created image description
+* Fixes #2, when using the customisation script.
+
 ### 1.2.0
 * First release directly to GitHub
 * Mostly documentation

diff --git a/env/versions.env b/env/versions.env
@@ -1,5 +1,5 @@
 #!/bin/bash
-export DOCKSTORE_VERSION="1.2.3"
+export DOCKSTORE_VERSION="1.2.5"
 export PIP_SETUPTOOLS_VER="28.8.0"
 export PIP_CWLTOOL_VER="1.0.20170217172322"
 export PIP_SCHEMA_SALAD_VER="2.2.20170222151604"

diff --git a/scripts/pbuild.sh b/scripts/pbuild.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CGP_DS_VERSION=1.2.2
+CGP_DS_VERSION=1.2.3
 
 set -ue
 

diff --git a/scripts/trusty/build.sh b/scripts/trusty/build.sh
@@ -56,7 +56,7 @@ config-file-location = /home/ubuntu/.s3cfg
 # plugins we want:
 sudo -u ubuntu bash -c 'echo "[{
   \"name\": \"dockstore-file-s3cmd-plugin\",
-  \"version\": \"0.0.4\"
+  \"version\": \"0.0.6\"
   }
 ]
 " > /home/ubuntu/.dockstore/plugins.json'

diff --git a/scripts/xenial/build.sh b/scripts/xenial/build.sh
@@ -56,7 +56,7 @@ config-file-location = /home/ubuntu/.s3cfg
 # plugins we want:
 sudo -u ubuntu bash -c 'echo "[{
   \"name\": \"dockstore-file-s3cmd-plugin\",
-  \"version\": \"0.0.4\"
+  \"version\": \"0.0.6\"
   }
 ]
 " > /home/ubuntu/.dockstore/plugins.json'