v1.6.7

8e598ab4 · Denise Schannon · ee9965fe · 8e598ab4
Commit 8e598ab4 authored 7 years ago by Denise Schannon
Hide whitespace changes
Inline Side-by-side

Showing

with 2 additions and 3 deletions
+2 -3
--- 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.7-rc1
+ENV CATTLE_RANCHER_SERVER_VERSION v1.6.7
 ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.6.17
 ENV CATTLE_CATTLE_VERSION v0.183.5
 ENV CATTLE_RANCHER_CLI_VERSION v0.6.3
 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