From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Tue, 19 Sep 2017 10:09:31 +0000 (+0200)
Subject: Jenkins: Push to public Docker registry, :latest and :dev, updated readme
X-Git-Tag: v3.1~3^2~1
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=51389acff7cc3db4797b9aa0f0a633afee4c6b9a;p=osm%2Fvim-emu.git

Jenkins: Push to public Docker registry, :latest and :dev, updated readme

Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>
---

diff --git a/Jenkinsfile b/Jenkinsfile
index 0f6d50a..5e85992 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,6 +26,9 @@ pipeline {
                 echo 'Packaging (Docker-image)...'
                 // push to public Docker registry
                 sh "docker push sonatanfv/son-emu:dev"
+                // might be moved to another job (:dev and :latest are the same for now)
+                sh "docker tag sonatanfv/son-emu:dev sonatanfv/son-emu:latest"
+                sh "docker push sonatanfv/son-emu:latest"
                 // push to internal Docker registry
                 sh "docker tag sonatanfv/son-emu:dev registry.sonata-nfv.eu:5000/son-emu:latest"
                 sh "docker push registry.sonata-nfv.eu:5000/son-emu"        
@@ -36,14 +39,14 @@ pipeline {
          success {
                  mail(from: "jenkins@sonata-nfv.eu", 
                  to: "manuel.peuster@upb.de", 
-                 subject: "SUCCESS: son-emu-pipeline",
-                 body: "Job ${env.BUILD_ID} on ${env.JENKINS_URL}")
+                 subject: "SUCCESS: ${env.JOB_NAME}/${env.BUILD_ID} building ${env.BRANCH_NAME}",
+                 body: "${env.JENKINS_URL}")
          }
          failure {
                   mail(from: "jenkins@sonata-nfv.eu", 
                  to: "manuel.peuster@upb.de", 
-                 subject: "FAILURE: son-emu-pipeline",
-                 body: "Job ${env.BUILD_ID} on ${env.JENKINS_URL}")
+                 subject: "FAILURE: ${env.JOB_NAME}/${env.BUILD_ID} building ${env.BRANCH_NAME}",
+                 body: "${env.JENKINS_URL}")
          }
     }
 }
diff --git a/README.md b/README.md
index 9fe159e..f82a010 100755
--- a/README.md
+++ b/README.md
@@ -120,10 +120,14 @@ Follow the MOTD in the VM to run the example topology and the dummy-gatekeeper.
 ### Option 3: Nested Docker Deployment
 This option requires a Docker installation on the host machine on which the emulator should be deployed.
 
-* `git clone https://github.com/sonata-nfv/son-emu.git`
-* `cd ~/son-emu`
-* Build the container: `docker build -t son-emu-img .`
-* Run the (interactive) container: `docker run --name son-emu -it --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock son-emu-img /bin/bash`
+* **Option a)** Build container manually:
+    * `git clone https://github.com/sonata-nfv/son-emu.git`
+    * `cd ~/son-emu`
+    * Build the container: `docker build -t son-emu-img .`
+    * Run the (interactive) container: `docker run --name son-emu -it --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock son-emu-img /bin/bash`
+* **Option b)** Use latest pre-build container from [DockerHub](https://hub.docker.com/r/sonatanfv/son-emu/)
+    * Pull the container: `docker pull sonatanfv/son-emu:dev`
+    * Run the (interactive) container: `docker run --name son-emu -it --rm --privileged --pid='host' -v /var/run/docker.sock:/var/run/docker.sock sonatanfv/son-emu:dev /bin/bash`
 
 
 ## Usage