From 11de3fc9620923b70fc639d3dbc77af6144db687 Mon Sep 17 00:00:00 2001 From: gitlawr Date: Fri, 27 Sep 2019 14:32:28 +0800 Subject: [PATCH] Update images --- apis/management.cattle.io/v3/tools_system_images.go | 6 +++--- image/mirror.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apis/management.cattle.io/v3/tools_system_images.go b/apis/management.cattle.io/v3/tools_system_images.go index ff13bcbf..61b7c4fc 100644 --- a/apis/management.cattle.io/v3/tools_system_images.go +++ b/apis/management.cattle.io/v3/tools_system_images.go @@ -14,10 +14,10 @@ var ( }{ PipelineSystemImages: projectv3.PipelineSystemImages{ Jenkins: m("rancher/pipeline-jenkins-server:v0.1.4"), - JenkinsJnlp: m("jenkins/jnlp-slave:3.10-1-alpine"), + JenkinsJnlp: m("jenkins/jnlp-slave:3.35-4"), AlpineGit: m("rancher/pipeline-tools:v0.1.14"), - PluginsDocker: m("plugins/docker:17.12"), - Minio: m("minio/minio:RELEASE.2018-05-25T19-49-13Z"), + PluginsDocker: m("plugins/docker:18.09"), + Minio: m("minio/minio:RELEASE.2019-09-25T18-25-51Z"), Registry: m("registry:2"), RegistryProxy: m("rancher/pipeline-tools:v0.1.14"), KubeApply: m("rancher/pipeline-tools:v0.1.14"), diff --git a/image/mirror.go b/image/mirror.go index 7bab3097..289d0666 100644 --- a/image/mirror.go +++ b/image/mirror.go @@ -14,7 +14,7 @@ func Mirror(image string) string { image = strings.Replace(image, "quay.io/coreos/", "rancher/coreos-", 1) image = strings.Replace(image, "quay.io/calico/", "rancher/calico-", 1) image = strings.Replace(image, "k8s.gcr.io/", "rancher/nginx-ingress-controller-", 1) - image = strings.Replace(image, "plugins/docker", "rancher/jenkins-plugins-docker", 1) + image = strings.Replace(image, "plugins/docker", "rancher/plugins-docker", 1) image = strings.Replace(image, "kibana", "rancher/kibana", 1) image = strings.Replace(image, "jenkins/", "rancher/jenkins-", 1) image = strings.Replace(image, "alpine/git", "rancher/alpine-git", 1)