You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2021/01/19 18:39:47 UTC

[incubator-hop] branch master updated: getting pom version as per Jenkins Pipleline docs recommendation (#557)

This is an automated email from the ASF dual-hosted git repository.

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new b7bf83d  getting pom version as per Jenkins Pipleline docs recommendation (#557)
b7bf83d is described below

commit b7bf83d40b3e87551504bc0d0c4a9cf299889afd
Author: Mahendran Mookkiah <ma...@gmail.com>
AuthorDate: Tue Jan 19 13:39:40 2021 -0500

    getting pom version as per Jenkins Pipleline docs recommendation (#557)
    
    * getting pom version as https://www.jenkins.io/doc/pipeline/steps/pipeline-utility-steps/#readmavenpom-read-a-maven-project-file recommendation
    
    * docker repo updated
---
 Jenkinsfile      | 2 +-
 docker/README.md | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 976261d..bb3846b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -86,7 +86,7 @@ pipeline {
             }
             steps{
                 script {
-                    env.POM_VERSION = sh(script: "mvn help:evaluate -Dexpression=project.version | sed -n -e '/^\\[.*\\]/ !{ /^[0-9]/ { p; q } }'", returnStdout: true).trim()
+                    env.POM_VERSION = sh script: 'mvn help:evaluate -Dexpression=project.version -q -DforceStdout', returnStdout: true
                 }
                 echo "The version fo the pom is: ${env.POM_VERSION}"
             }
diff --git a/docker/README.md b/docker/README.md
index 74c4b15..a3ba64f 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -71,7 +71,7 @@ docker run -it --rm \
   --env HOP_RUN_PARAMETERS=PARAM_LOG_MESSAGE=Hello,PARAM_WAIT_FOR_X_MINUTES=1 \
   -v /path/to/local/dir:/files \
   --name my-simple-hop-container \
-  docker pull projecthop/hop:<tag>
+  docker pull docker.io/apache/incubator-hop:<tag>
 ```
 
 If you need a **long-lived container**, this option is also available. Run this command e.g.:
@@ -88,7 +88,7 @@ docker run -it --rm \
   -p 8080:8080
   -v /path/to/local/dir:/files \
   --name my-simple-hop-container \
-  docker pull projecthop/hop:<tag>
+  docker pull docker.io/apache/incubator-hop:<tag>
 ```
 
 You can then access the hop-server UI from your dockerhost at `http://localhost:8080`