Merge pull request #59 from overture-stack/rc/2.7.0

Rc/2.7.0

Author: yalturmes

Jenkinsfile

@@ -2,6 +2,9 @@ import groovy.json.JsonOutput
 
 def version = "UNKNOWN"
 def commit = "UNKNOWN"
+def dockerHubRepo = "overture/rollcall"
+def gitHubRegistry = "ghcr.io"
+def gitHubRepo = "overture-stack/rollcall"
 
 pipeline {
     agent {
@@ -26,21 +29,22 @@ 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
   - name: dind-daemon
     image: docker:18.06-dind
     securityContext:
         privileged: true
+        runAsUser: 0
     volumeMounts:
       - name: docker-graph-storage
         mountPath: /var/lib/docker
+  securityContext:
+    runAsUser: 1000
   volumes:
-  - name: docker-sock
-    hostPath:
-      path: /var/run/docker.sock
-      type: File
   - name: docker-graph-storage
     emptyDir: {}
 """
@@ -73,10 +77,19 @@ spec:
                     withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                         sh 'docker login -u $USERNAME -p $PASSWORD'
                     }
-                    sh "docker build --network=host -f Dockerfile . -t overture/rollcall:edge -t overture/rollcall:${commit}"
-                    sh "docker push overture/rollcall:edge"
-                    sh "docker push overture/rollcall:${commit}"
+                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:edge -t ${dockerHubRepo}:${commit}"
+                    sh "docker push ${dockerHubRepo}:edge"
+                    sh "docker push ${dockerHubRepo}:${commit}"
+                }
+                container('docker') {
+                    withCredentials([usernamePassword(credentialsId:'OvertureBioGithub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                        sh "docker login ${gitHubRegistry} -u $USERNAME -p $PASSWORD"
+                    }
+                    sh "docker build --network=host -f Dockerfile . -t ${gitHubRegistry}/${gitHubRepo}:edge -t ${gitHubRegistry}/${gitHubRepo}:${commit}"
+                    sh "docker push ${gitHubRegistry}/${gitHubRepo}:edge"
+                    sh "docker push ${gitHubRegistry}/${gitHubRepo}:${commit}"
                 }
+
             }
         }
         stage('Release & tag') {
@@ -87,15 +100,24 @@ spec:
                 container('docker') {
                     withCredentials([usernamePassword(credentialsId: 'OvertureBioGithub', passwordVariable: 'GIT_PASSWORD', usernameVariable: 'GIT_USERNAME')]) {
                         sh "git tag ${version}"
-                        sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/overture-stack/rollcall --tags"
+                        sh "git push https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/${gitHubRepo} --tags"
                     }
                     withCredentials([usernamePassword(credentialsId:'OvertureDockerHub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                         sh 'docker login -u $USERNAME -p $PASSWORD'
                     }
-                    sh "docker build --network=host -f Dockerfile . -t overture/rollcall:latest -t overture/rollcall:${version}"
-                    sh "docker push overture/rollcall:${version}"
-                    sh "docker push overture/rollcall:latest"
+                    sh "docker build --network=host -f Dockerfile . -t ${dockerHubRepo}:latest -t ${dockerHubRepo}:${version}"
+                    sh "docker push ${dockerHubRepo}:${version}"
+                    sh "docker push ${dockerHubRepo}:latest"
                 }
+                container('docker') {
+                    withCredentials([usernamePassword(credentialsId:'OvertureBioGithub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
+                        sh "docker login ${gitHubRegistry} -u $USERNAME -p $PASSWORD"
+                    }
+                    sh "docker build --network=host -f Dockerfile . -t ${gitHubRegistry}/${gitHubRepo}:latest -t ${gitHubRegistry}/${gitHubRepo}:${version}"
+                    sh "docker push ${gitHubRegistry}/${gitHubRepo}:${version}"
+                    sh "docker push ${gitHubRegistry}/${gitHubRepo}:latest"
+                }
+
           }
         }
     }

pom.xml

@@ -23,7 +23,7 @@
 
     <groupId>bio.overture</groupId>
     <artifactId>rollcall</artifactId>
-    <version>2.6.0</version>
+    <version>2.7.0</version>
     <packaging>jar</packaging>
 
     <name>rollcall</name>