@@ -285,7 +285,7 @@ func dockerfileImageBuild(
285
285
func generateJob (trigger dx.ImageBuildRequest , name , sourceUrl string ) * batchv1.Job {
286
286
var ttlSecondsAfterFinished int32 = 60
287
287
var backOffLimit int32 = 0
288
- return & batchv1.Job {
288
+ job := & batchv1.Job {
289
289
TypeMeta : meta_v1.TypeMeta {
290
290
Kind : "Job" ,
291
291
APIVersion : "batch/v1" ,
@@ -330,11 +330,6 @@ func generateJob(trigger dx.ImageBuildRequest, name, sourceUrl string) *batchv1.
330
330
MountPath : "/workspace" ,
331
331
Name : "workspace" ,
332
332
},
333
- // TODO test purpose
334
- {
335
- MountPath : "/kaniko/.docker" ,
336
- Name : "docker-config" ,
337
- },
338
333
},
339
334
},
340
335
},
@@ -350,23 +345,33 @@ func generateJob(trigger dx.ImageBuildRequest, name, sourceUrl string) *batchv1.
350
345
},
351
346
},
352
347
},
353
- {
354
- // TODO test purpose
355
- Name : "docker-config" ,
356
- VolumeSource : corev1.VolumeSource {
357
- ConfigMap : & corev1.ConfigMapVolumeSource {
358
- LocalObjectReference : corev1.LocalObjectReference {
359
- Name : "docker-config" ,
360
- },
361
- },
362
- },
363
- },
364
348
},
365
349
},
366
350
},
367
351
BackoffLimit : & backOffLimit ,
368
352
},
369
353
}
354
+
355
+ // TODO
356
+ if ! strings .HasPrefix (trigger .Image , "127.0.0.1:32447" ) {
357
+ job .Spec .Template .Spec .Containers [0 ].VolumeMounts = append (job .Spec .Template .Spec .Containers [0 ].VolumeMounts , corev1.VolumeMount {
358
+ MountPath : "/kaniko/.docker" ,
359
+ Name : "docker-config" ,
360
+ })
361
+
362
+ job .Spec .Template .Spec .Volumes = append (job .Spec .Template .Spec .Volumes , corev1.Volume {
363
+ Name : "docker-config" ,
364
+ VolumeSource : corev1.VolumeSource {
365
+ ConfigMap : & corev1.ConfigMapVolumeSource {
366
+ LocalObjectReference : corev1.LocalObjectReference {
367
+ Name : "docker-config" ,
368
+ },
369
+ },
370
+ },
371
+ })
372
+ }
373
+
374
+ return job
370
375
}
371
376
372
377
func streamInitContainerLogs (kubeEnv * agent.KubeEnv ,
0 commit comments