rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-04-28 02:30:07 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1093 from StrongMonkey/update-rancher-pipeline-images

Browse Source 
Update rancher pipeline images
This commit is contained in:
Daishan Peng 2020-02-24 13:42:01 -07:00 committed by GitHub
commit 0cbd16146c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apis/management.cattle.io/v3/tools_system_images.go
View File

@ -13,17 +13,17 @@ var (
AuthSystemImages AuthSystemImages
}{
PipelineSystemImages: projectv3.PipelineSystemImages{
Jenkins: m("rancher/pipeline-jenkins-server:v0.1.4"),
JenkinsJnlp: m("jenkins/jnlp-slave:3.35-4"),
Jenkins: m("rancher/pipeline-jenkins-server:v0.1.5"),
JenkinsJnlp: m("jenkins/jnlp-slave:3.40-1"),
AlpineGit: m("rancher/pipeline-tools:v0.1.14"),
PluginsDocker: m("plugins/docker:18.09"),
Minio: m("minio/minio:RELEASE.2019-09-25T18-25-51Z"),
Minio: m("minio/minio:RELEASE.2020-02-07T23-28-16Z"),
Registry: m("registry:2"),
RegistryProxy: m("rancher/pipeline-tools:v0.1.14"),
KubeApply: m("rancher/pipeline-tools:v0.1.14"),
},
AuthSystemImages: AuthSystemImages{
KubeAPIAuth: m("rancher/kube-api-auth:v0.1.3"),
KubeAPIAuth: m("rancher/kube-api-auth:v0.1.4"),
},
}
)

4
image/mirror.go
View File

@ -6,9 +6,6 @@ var Mirrors = map[string]string{}
func Mirror(image string) string {
orig := image
if strings.HasPrefix(image, "weaveworks") {
return image
}
image = strings.Replace(image, "gcr.io/google_containers", "rancher", 1)
image = strings.Replace(image, "quay.io/coreos/", "rancher/coreos-", 1)
@ -24,6 +21,7 @@ func Mirror(image string) string {
image = strings.Replace(image, "quay.io/pires", "rancher", 1)
image = strings.Replace(image, "coredns/", "rancher/coredns-", 1)
image = strings.Replace(image, "minio/", "rancher/minio-", 1)
image = strings.Replace(image, "weaveworks/", "rancher/weaveworks-", 1)
Mirrors[image] = orig
return image