v1.6.19

3440a292 · Denise Schannon · e43d9322 · 3440a292
Commit 3440a292 authored 6 years ago by Denise Schannon
Hide whitespace changes
Inline Side-by-side

Showing

with 3 additions and 4 deletions
+3 -4
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -39,13 +39,12 @@ EXPOSE 8080
 ENV CATTLE_HOST_API_PROXY_MODE embedded

 # Environment variables commonly updated when performing a release
-ENV CATTLE_RANCHER_SERVER_VERSION v1.6.19-rc8
+ENV CATTLE_RANCHER_SERVER_VERSION v1.6.19
 ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.6.45
 ENV CATTLE_CATTLE_VERSION v0.183.59
-ENV CATTLE_RANCHER_CLI_VERSION v0.6.11-rc2
+ENV CATTLE_RANCHER_CLI_VERSION v0.6.11
 ENV CATTLE_RANCHER_COMPOSE_VERSION v0.12.5
-#ENV DEFAULT_CATTLE_CATALOG_URL='{"catalogs":{"community":{"url":"https://git.rancher.io/community-catalog.git","branch":"master"},"library":{"url":"https://git.rancher.io/rancher-catalog.git","branch":"${RELEASE}"}}}'
-ENV DEFAULT_CATTLE_CATALOG_URL='{"catalogs":{"community":{"url":"https://git.rancher.io/community-catalog.git","branch":"master"},"library":{"url":"https://git.rancher.io/rancher-catalog.git","branch":"v1.6-development"}}}'
+ENV DEFAULT_CATTLE_CATALOG_URL='{"catalogs":{"community":{"url":"https://git.rancher.io/community-catalog.git","branch":"master"},"library":{"url":"https://git.rancher.io/rancher-catalog.git","branch":"${RELEASE}"}}}'

 ENV DEFAULT_CATTLE_RANCHER_COMPOSE_LINUX_URL   https://releases.rancher.com/compose/${CATTLE_RANCHER_COMPOSE_VERSION}/rancher-compose-linux-amd64-${CATTLE_RANCHER_COMPOSE_VERSION}.tar.gz
 ENV DEFAULT_CATTLE_RANCHER_COMPOSE_DARWIN_URL  https://releases.rancher.com/compose/${CATTLE_RANCHER_COMPOSE_VERSION}/rancher-compose-darwin-amd64-${CATTLE_RANCHER_COMPOSE_VERSION}.tar.gz