From a4fb4bbd7e864e953b6e9c70cf33a260a1d06356 Mon Sep 17 00:00:00 2001
From: Darren Shepherd <darren@rancher.com>
Date: Tue, 26 Jul 2016 20:57:27 -0700
Subject: [PATCH] v1.2.0-pre1-rc7
---
server/Dockerfile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/Dockerfile b/server/Dockerfile
index b85698486..bad4553ab 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -20,7 +20,7 @@ RUN chmod +x /usr/bin/giddyup /usr/bin/cluster-manager
COPY bin/* /usr/bin/
ENV CATTLE_HOME /var/lib/cattle
-ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.2.4
+ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.2.5
ENV CATTLE_API_UI_URL //releases.rancher.com/api-ui/1.0.7
ENV CATTLE_DB_CATTLE_DATABASE mysql
ENV CATTLE_USE_LOCAL_ARTIFACTS true
@@ -34,7 +34,7 @@ COPY target/*static.tar.gz /s6-statics/
EXPOSE 8080
ENV CATTLE_HOST_API_PROXY_MODE embedded
-ENV CATTLE_RANCHER_SERVER_VERSION v1.2.0-pre1-rc6
+ENV CATTLE_RANCHER_SERVER_VERSION v1.2.0-pre1-rc7
ENV CATTLE_RANCHER_COMPOSE_VERSION v0.9.0
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
@@ -42,7 +42,7 @@ ENV DEFAULT_CATTLE_RANCHER_COMPOSE_WINDOWS_URL https://releases.rancher.com/comp
ENV DEFAULT_CATTLE_CATALOG_URL="library=https://github.com/rancher/rancher-catalog.git,community=https://github.com/rancher/community-catalog.git"
EXPOSE 3306
-ENV CATTLE_CATTLE_VERSION v0.167.4
+ENV CATTLE_CATTLE_VERSION v0.167.5
ADD https://github.com/rancherio/cattle/releases/download/${CATTLE_CATTLE_VERSION}/cattle.jar /usr/share/cattle/
RUN cd / && for i in $(ls /s6-statics/*static.tar.gz);do tar -zxvf $i;done && rm -rf /s6-statics/*static.tar.gz && \
--
GitLab