Merge pull request #13 from LinuxSuRen/build-pipeline

Fix the pipeline script

Jenkinsfile

+def scmObj
 pipeline {
     agent {
         label "golang"
     }
 
+    environment {
+        FOLDER = 'src/github.com/jenkins-zh/wechat-backend'
+    }
+
     stages{
+        stage("clone") {
+            steps {
+                dir(FOLDER) {
+                    script {
+                        scmObj = checkout scm
+                    }
+                }
+            }
+        }
+
         stage("build") {
+            environment {
+                GOPATH = "${WORKSPACE}"
+            }
             steps {
-                sh 'make build'
+                dir(FOLDER) {
+                    container('golang'){
+                            sh '''
+                            CGO_ENABLED=0 GOOS=linux go build -ldflags "-w -s" -a -installsuffix cgo -o bin/wechat-backend
+                            '''
+                    }
+                    container('tools') {
+                        sh 'upx bin/wechat-backend'
+                    }
+                }
             }
         }
 
         stage("image") {
+            environment {
+                IMAGE_TAG = getCurrentCommit(scmObj)
+            }
             steps {
-                sh 'make image'
+                container('tools'){
+                    dir(FOLDER) {
+                        sh '''
+                        docker build -t surenpi/jenkins-wechat:$IMAGE_TAG .
+                        '''
+                    }
+                }
             }
         }
 
         stage("push-image") {
+            environment {
+                DOCKER_CREDS = credentials('docker-surenpi')
+                IMAGE_TAG = getCurrentCommit(scmObj)
+            }
             steps {
-                withCredentials([usernamePassword(credentialsId: '', passwordVariable: 'passwd', usernameVariable: 'user')]) {
+                container('tools') {
                     sh '''
-                    docker login -u $user -p $passwd
-                    make push-image
+                    docker login -u $DOCKER_CREDS_USR -p $DOCKER_CREDS_PSW
+                    docker push surenpi/jenkins-wechat:$IMAGE_TAG
                     docker logout
                     '''
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
+
+def getCurrentCommit(scmObj) {
+    return scmObj.GIT_COMMIT
+}

README.md

@@ -14,7 +14,7 @@ Sample config.yaml:
 
 ```
 token: wechat-token
-git_url: https://github.com/linuxsuren/wechat
+git_url: https://github.com/jenkins-zh/wechat
 git_branch: master
 github_webhook_secret: github-secret
 appID: wechat-appid

main.go

@@ -11,11 +11,11 @@ import (
 	"sort"
 	"strings"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
-	"github.com/linuxsuren/wechat-backend/pkg/article"
-	"github.com/linuxsuren/wechat-backend/pkg/config"
-	"github.com/linuxsuren/wechat-backend/pkg/github"
-	"github.com/linuxsuren/wechat-backend/pkg/reply"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
+	"github.com/jenkins-zh/wechat-backend/pkg/article"
+	"github.com/jenkins-zh/wechat-backend/pkg/config"
+	"github.com/jenkins-zh/wechat-backend/pkg/github"
+	"github.com/jenkins-zh/wechat-backend/pkg/reply"
 )
 
 // WeChat represents WeChat

menu.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/linuxsuren/wechat-backend/pkg/config"
+	"github.com/jenkins-zh/wechat-backend/pkg/config"
 )
 
 func PushWxMenuCreate(accessToken string, menuJsonBytes []byte) error {

pkg/article/articles.go

@@ -8,8 +8,8 @@ import (
 
 	"strings"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
-	"github.com/linuxsuren/wechat-backend/pkg/config"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
+	"github.com/jenkins-zh/wechat-backend/pkg/config"
 	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/yaml.v2"
 )

pkg/article/articles_test.go

@@ -3,7 +3,7 @@ package article
 import (
 	"testing"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
 	"github.com/stretchr/testify/assert"
 )
 

pkg/github/webhook.go

@@ -4,7 +4,7 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/linuxsuren/wechat-backend/pkg/config"
+	"github.com/jenkins-zh/wechat-backend/pkg/config"
 	"gopkg.in/go-playground/webhooks.v5/github"
 )
 

pkg/mock/article/articles-mock.go

@@ -6,7 +6,7 @@ package mock_article
 
 import (
 	gomock "github.com/golang/mock/gomock"
-	config "github.com/linuxsuren/wechat-backend/pkg/config"
+	config "github.com/jenkins-zh/wechat-backend/pkg/config"
 	reflect "reflect"
 )
 

pkg/reply/core.go

@@ -4,7 +4,7 @@ import (
 	"encoding/xml"
 	"time"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
 )
 
 // AutoReply represent auto reply interface

pkg/reply/match.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"log"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
-	"github.com/linuxsuren/wechat-backend/pkg/article"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
+	"github.com/jenkins-zh/wechat-backend/pkg/article"
 )
 
 var responseManager article.ResponseManager

pkg/reply/match_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	core "github.com/linuxsuren/wechat-backend/pkg"
-	mArticle "github.com/linuxsuren/wechat-backend/pkg/mock/article"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
+	mArticle "github.com/jenkins-zh/wechat-backend/pkg/mock/article"
 )
 
 func TestAccept(t *testing.T) {

pkg/reply/search.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
-	"github.com/linuxsuren/wechat-backend/pkg/article"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
+	"github.com/jenkins-zh/wechat-backend/pkg/article"
 )
 
 // SearchAutoReply only reply for match

pkg/reply/search_test.go

@@ -3,7 +3,7 @@ package reply
 import (
 	"testing"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
 )
 
 func TestSearch(t *testing.T) {

pkg/reply/unknown.go

@@ -3,7 +3,7 @@ package reply
 import (
 	"math"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
 )
 
 // UnknownAutoReply unknown auto reply

pkg/reply/unknown_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	core "github.com/linuxsuren/wechat-backend/pkg"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

pkg/reply/welcome.go

@@ -3,7 +3,7 @@ package reply
 import (
 	"fmt"
 
-	core "github.com/linuxsuren/wechat-backend/pkg"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
 )
 
 // WelcomeReply for welcome event

pkg/reply/welcome_test.go

@@ -4,8 +4,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	core "github.com/linuxsuren/wechat-backend/pkg"
-	mArticle "github.com/linuxsuren/wechat-backend/pkg/mock/article"
+	core "github.com/jenkins-zh/wechat-backend/pkg"
+	mArticle "github.com/jenkins-zh/wechat-backend/pkg/mock/article"
 )
 
 func TestWelcome(t *testing.T) {

token.go

@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/linuxsuren/wechat-backend/pkg/config"
+	"github.com/jenkins-zh/wechat-backend/pkg/config"
 )
 
 //https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=APPID&secret=APPSECRET

vendor/vendor.json

@@ -521,5 +521,5 @@
 			"revisionTime": "2018-03-28T19:50:20Z"
 		}
 	],
-	"rootPath": "github.com/linuxsuren/wechat-backend/pkg/"
+	"rootPath": "github.com/jenkins-zh/wechat-backend/pkg/"
 }