@@ -9,8 +9,9 @@ podTemplate(label: 'k8sdb-controller',
9
9
ttyEnabled : true
10
10
),
11
11
containerTemplate(
12
- name : ' docker' ,
13
- image : ' docker:latest' ,
12
+ name : ' kaniko' ,
13
+ command : ' /busybox/cat' ,
14
+ image : ' gcr.io/kaniko-project/executor:debug' ,
14
15
ttyEnabled : true
15
16
),
16
17
containerTemplate(
@@ -21,17 +22,13 @@ podTemplate(label: 'k8sdb-controller',
21
22
),
22
23
],
23
24
volumes : [
24
- hostPathVolume( mountPath : ' /var/run/docker.sock ' , hostPath : ' /var/run/docker.sock ' ),
25
+ secretVolume( secretName : ' dockerauth ' , mountPath : ' /root/dockerauth ' )
25
26
]
26
27
) {
27
28
node (' k8sdb-controller' ) {
28
29
ansiColor(" xterm" ) {
29
30
stage(' checkout' ) {
30
31
checkout(scm)
31
-
32
- container(' docker' ) {
33
- dockerAuth()
34
- }
35
32
}
36
33
37
34
stage(" build" ) {
@@ -56,16 +53,17 @@ podTemplate(label: 'k8sdb-controller',
56
53
57
54
version = " $major . $minor . $patch $group "
58
55
59
- container(' docker ' ) {
60
- sh " docker build . -t nexus.doodle.com:5000/devops/k8sdb-controller: ${ env.TAG_NAME } "
61
- sh " docker push nexus.doodle.com:5000/devops/k8sdb-controller:${ env.TAG_NAME} "
56
+ container(name : ' kaniko ' , shell : ' /busybox/sh ' ) {
57
+ sh " cp /root/dockerauth/.dockerconfigjson /kaniko/.docker/config.json "
58
+ sh " /kaniko/executor -f `pwd`/Dockerfile -c `pwd` --destination=' nexus.doodle.com:5000/devops/k8sdb-controller:${ env.TAG_NAME} ' "
62
59
}
63
60
64
61
container(' helm' ) {
65
62
bumpChartVersion(version)
66
63
bumpImageVersion(env. TAG_NAME )
67
64
68
65
tgz= " k8sdb-controller-${ version} .tgz"
66
+ sh " mkdir chart/k8sdb-controller/crds"
69
67
sh " cp config/crd/bases/* chart/k8sdb-controller/crds"
70
68
sh " helm package chart/k8sdb-controller"
71
69
}
@@ -84,28 +82,6 @@ podTemplate(label: 'k8sdb-controller',
84
82
}
85
83
}
86
84
87
- void dockerAuth () {
88
- // nexus repository
89
- withCredentials([[
90
- $class : ' UsernamePasswordMultiBinding' ,
91
- credentialsId : ' nexus' ,
92
- usernameVariable : ' NEXUS_USER' ,
93
- passwordVariable : ' NEXUS_PASSWORD'
94
- ]]) {
95
- sh " docker login nexus.doodle.com:5000 -u ${ env.NEXUS_USER} -p ${ env.NEXUS_PASSWORD} "
96
- }
97
-
98
- // docker hub
99
- withCredentials([[
100
- $class : ' UsernamePasswordMultiBinding' ,
101
- credentialsId : ' dockerhub' ,
102
- usernameVariable : ' DOCKERHUB_USER' ,
103
- passwordVariable : ' DOCKERHUB_PASSWORD'
104
- ]]) {
105
- sh " docker login -u ${ env.DOCKERHUB_USER} -p ${ env.DOCKERHUB_PASSWORD} "
106
- }
107
- }
108
-
109
85
def bumpImageVersion (String version ) {
110
86
echo " Update image tag"
111
87
def valuesFile = " ./chart/k8sdb-controller/values.yaml"
0 commit comments