v1.6.30

e780d341 · Denise Schannon · Denise · d1f0c415 · e780d341
Commit e780d341 authored 5 years ago by Denise Schannon Committed by Denise 5 years ago
Hide whitespace changes
Inline Side-by-side

Showing

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

 # Environment variables commonly updated when performing a release
-ENV CATTLE_RANCHER_SERVER_VERSION v1.6.30-rc1
+ENV CATTLE_RANCHER_SERVER_VERSION v1.6.30
 ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.6.52
 ENV CATTLE_CATTLE_VERSION v0.183.83
 ENV CATTLE_RANCHER_CLI_VERSION v0.6.14
 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_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_RANCHER_COMPOSE_LINUX_URL   https://releases.rancher.com/compose/${CATTLE_RANCHER_COMPOSE_VERSION}/rancher-compose-linux-amd64-${CATTLE_RANCHER_COMPOSE_VERSION}.tar.gz