Switch to rancher/rancher and rancher/rancher-agent

shenyunfeng · Apr 26, 2018 · fe8e295 · fe8e295
1 parent f9c1a04
commit fe8e295
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -19,7 +19,7 @@ pipeline:
   docker-publish-master:
     image: plugins/docker
     dockerfile: package/Dockerfile
-    repo: rancher/server
+    repo: rancher/rancher
     context: package/
     tag: master
     secrets: [docker_username, docker_password]
@@ -32,7 +32,7 @@ pipeline:
   docker-publish-master-agent:
     image: plugins/docker
     dockerfile: package/Dockerfile.agent
-    repo: rancher/agent
+    repo: rancher/rancher-agent
     context: package/
     tag: master
     secrets: [docker_username, docker_password]
@@ -45,7 +45,7 @@ pipeline:
   docker-publish:
     image: plugins/docker
     dockerfile: package/Dockerfile
-    repo: rancher/server
+    repo: rancher/rancher
     context: package/
     tag: ${DRONE_TAG}
     secrets: [docker_username, docker_password]
@@ -58,7 +58,7 @@ pipeline:
   docker-publish-agent:
     image: plugins/docker
     dockerfile: package/Dockerfile.agent
-    repo: rancher/agent
+    repo: rancher/rancher-agent
     context: package/
     tag: ${DRONE_TAG}
     secrets: [docker_username, docker_password]

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
@@ -1,6 +1,6 @@
 **Rancher versions:**
-rancher/server:
-rancher/agent:
+rancher/server or rancher/rancher:
+rancher/agent or rancher/rancher-agent:
 
 **Infrastructure Stack versions:**
 healthcheck:

diff --git a/package/Dockerfile b/package/Dockerfile
@@ -30,7 +30,7 @@ ARG VERSION=dev
 ENV CATTLE_SERVER_VERSION ${VERSION}
 COPY rancher /usr/bin/
 
-ENV CATTLE_AGENT_IMAGE rancher/agent:${VERSION}
-ENV CATTLE_SERVER_IMAGE rancher/server
+ENV CATTLE_AGENT_IMAGE rancher/rancher-agent:${VERSION}
+ENV CATTLE_SERVER_IMAGE rancher/rancher
 VOLUME /var/lib/rancher
 ENTRYPOINT ["rancher", "--http-listen-port=80", "--https-listen-port=443"]
diff --git a/package/Dockerfile.agent b/package/Dockerfile.agent
@@ -12,7 +12,7 @@ COPY --from=k8s /usr/bin/kubectl /usr/bin/
 ARG VERSION=dev
 LABEL io.cattle.agent true
 ENV DOCKER_API_VERSION 1.24
-ENV AGENT_IMAGE rancher/agent:${VERSION}
+ENV AGENT_IMAGE rancher/rancher-agent:${VERSION}
 ENV SSL_CERT_DIR /etc/kubernetes/ssl/certs
 COPY agent run.sh kubectl-shell.sh shell-setup.sh share-root.sh /usr/bin/
 ENTRYPOINT ["run.sh"]
diff --git a/pkg/settings/setting.go b/pkg/settings/setting.go
@@ -10,7 +10,7 @@ var (
 	settings = map[string]Setting{}
 	provider Provider
 
-	AgentImage                      = newSetting("agent-image", "rancher/agent:master")
+	AgentImage                      = newSetting("agent-image", "rancher/rancher-agent:master")
 	CACerts                         = newSetting("cacerts", "")
 	CLIURLDarwin                    = newSetting("cli-url-darwin", "https://releases.rancher.com/cli/v1.0.0-alpha8/rancher-darwin-amd64-v1.0.0-alpha8.tar.gz")
 	CLIURLLinux                     = newSetting("cli-url-linux", "https://releases.rancher.com/cli/v1.0.0-alpha8/rancher-linux-amd64-v1.0.0-alpha8.tar.gz")
@@ -23,7 +23,7 @@ var (
 	KubernetesVersionToSystemImages = newSetting("k8s-version-to-images", getSystemImages())
 	MachineVersion                  = newSetting("machine-version", "dev")
 	SystemDefaultRegistry           = newSetting("system-default-registry", "")
-	ServerImage                     = newSetting("server-image", "rancher/server")
+	ServerImage                     = newSetting("server-image", "rancher/rancher")
 	ServerVersion                   = newSetting("server-version", "dev")
 	ServerURL                       = newSetting("server-url", "")
 	TelemetryOpt                    = newSetting("telemetry-opt", "")