Merge pull request #296 from overture-stack/rc/5.3.0

Rc/5.3.0 Updated Jenkinsfile - fixed docker image versions
overture-stack · Mar 18, 2021 · b74694a · b74694a
2 parents 1b8c0c8 + 9f0cd82
commit b74694a
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -153,11 +153,11 @@ spec:
                     withCredentials([usernamePassword(credentialsId:'OvertureBioGithub', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]) {
                         sh "docker login ${gitHubRegistry} -u $USERNAME -p $PASSWORD"
                     }
-                    sh "docker build --target=server --network=host -f Dockerfile . -t ${gitHubRegistry}/${gitHubRepo}-server:latest -t ${gitHubRegistry}/${gitHubRepo}-server:${commit}"
-                    sh "docker build --target=client --network=host -f Dockerfile . -t ${gitHubRegistry}/${gitHubRepo}:latest -t ${gitHubRegistry}/${gitHubRepo}:${commit}"
-                    sh "docker push ${gitHubRegistry}/${gitHubRepo}-server:${commit}"
+                    sh "docker build --target=server --network=host -f Dockerfile . -t ${gitHubRegistry}/${gitHubRepo}-server:latest -t ${gitHubRegistry}/${gitHubRepo}-server:${version}"
+                    sh "docker build --target=client --network=host -f Dockerfile . -t ${gitHubRegistry}/${gitHubRepo}:latest -t ${gitHubRegistry}/${gitHubRepo}:${version}"
+                    sh "docker push ${gitHubRegistry}/${gitHubRepo}-server:${version}"
                     sh "docker push ${gitHubRegistry}/${gitHubRepo}-server:latest"
-                    sh "docker push ${gitHubRegistry}/${gitHubRepo}:${commit}"
+                    sh "docker push ${gitHubRegistry}/${gitHubRepo}:${version}"
                     sh "docker push ${gitHubRegistry}/${gitHubRepo}:latest"
                 }
             }

diff --git 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
 
   <groupId>bio.overture</groupId>
   <artifactId>score</artifactId>
-  <version>5.2.0</version>
+  <version>5.3.0</version>
   <packaging>pom</packaging>
 
   <name>${project.artifactId}</name>

diff --git 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
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git 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
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git 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
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git 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
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git 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
   <parent>
     <groupId>bio.overture</groupId>
     <artifactId>score</artifactId>
-    <version>5.2.0</version>
+    <version>5.3.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>