diff --git a/Jenkinsfile b/Jenkinsfile index 462563e7..70e692be 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,6 +49,7 @@ spec: image: docker:18.06-dind securityContext: privileged: true + runAsUser: 0 volumeMounts: - name: docker-graph-storage mountPath: /var/lib/docker @@ -60,14 +61,14 @@ spec: - name: docker image: docker:18-git tty: true - volumeMounts: - - mountPath: /var/run/docker.sock - name: docker-sock + env: + - name: DOCKER_HOST + value: tcp://localhost:2375 + - name: HOME + value: /home/jenkins/agent + securityContext: + runAsUser: 1000 volumes: - - name: docker-sock - hostPath: - path: /var/run/docker.sock - type: File - name: docker-graph-storage emptyDir: {} - name: maven-cache diff --git a/pom.xml b/pom.xml index 61f696b3..f23345ea 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S bio.overture score - 5.5.0 + 5.6.0 pom ${project.artifactId} @@ -239,7 +239,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S 1.11.219 - 4.4.0 + 8.6.6 1.69 diff --git a/score-client/pom.xml b/score-client/pom.xml index f87a86d5..614c8fa0 100644 --- a/score-client/pom.xml +++ b/score-client/pom.xml @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S bio.overture score - 5.5.0 + 5.6.0 ../pom.xml diff --git a/score-client/src/main/bin/score-client b/score-client/src/main/bin/score-client index 77401333..f8fa645c 100755 --- a/score-client/src/main/bin/score-client +++ b/score-client/src/main/bin/score-client @@ -48,7 +48,10 @@ BASE_DIR=`dirname $0`/..; export BASE_DIR # Installation directory CLIENT_DIR="$(cd ${BASE_DIR} && pwd -P)" -exec java -Xmx3G --illegal-access=deny \ +exec java -Xmx3G \ + --add-opens=java.base/jdk.internal.ref=ALL-UNNAMED \ + --add-opens=java.base/java.nio=ALL-UNNAMED \ + --illegal-access=deny \ -Dlogging.path=${BASE_DIR}/logs \ -Dspring.config.additional-location=${CLIENT_DIR}/conf/ \ -Dlogging.config=${CLIENT_DIR}/conf/logback.xml \ diff --git a/score-client/src/main/java/bio/overture/score/client/upload/azure/AzureUploadService.java b/score-client/src/main/java/bio/overture/score/client/upload/azure/AzureUploadService.java index 54558807..83978b44 100644 --- a/score-client/src/main/java/bio/overture/score/client/upload/azure/AzureUploadService.java +++ b/score-client/src/main/java/bio/overture/score/client/upload/azure/AzureUploadService.java @@ -122,6 +122,7 @@ public void eventOccurred(RetryingEvent eventArg) { val options = new BlobRequestOptions(); options.setConcurrentRequestCount(parallelUploads); + blob.setStreamWriteSizeInBytes(BLOCK_SIZE); progress.start(); progress.startTransfer(); diff --git a/score-core/pom.xml b/score-core/pom.xml index 77bc79d5..caa5c9c8 100644 --- a/score-core/pom.xml +++ b/score-core/pom.xml @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S bio.overture score - 5.5.0 + 5.6.0 ../pom.xml diff --git a/score-fs/pom.xml b/score-fs/pom.xml index 04448b0c..97d7fad5 100644 --- a/score-fs/pom.xml +++ b/score-fs/pom.xml @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S bio.overture score - 5.5.0 + 5.6.0 ../pom.xml diff --git a/score-server/pom.xml b/score-server/pom.xml index d7705645..9d121a80 100644 --- a/score-server/pom.xml +++ b/score-server/pom.xml @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S bio.overture score - 5.5.0 + 5.6.0 ../pom.xml diff --git a/score-test/pom.xml b/score-test/pom.xml index 41d3537c..31598b55 100644 --- a/score-test/pom.xml +++ b/score-test/pom.xml @@ -21,7 +21,7 @@ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S bio.overture score - 5.5.0 + 5.6.0 ../pom.xml