v1.1.0-rc4

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.1.11
+ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.1.12
 ENV CATTLE_DB_CATTLE_DATABASE mysql
 ENV CATTLE_USE_LOCAL_ARTIFACTS true
 ENV no_proxy localhost,127.0.0.1,localaddress,.localdomain.com
@@ -33,7 +33,7 @@ COPY target/*static.tar.gz /s6-statics/
 
 EXPOSE 8080
 ENV CATTLE_HOST_API_PROXY_MODE embedded
-ENV CATTLE_RANCHER_SERVER_IMAGE v1.1.0-rc3
+ENV CATTLE_RANCHER_SERVER_VERSION v1.1.0-rc4
 ENV CATTLE_RANCHER_COMPOSE_VERSION v0.8.5
 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
@@ -41,7 +41,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.165.2
+ENV CATTLE_CATTLE_VERSION v0.165.3
 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 && \
@@ -57,5 +57,6 @@ VOLUME /var/lib/mysql /var/log/mysql /var/lib/cattle
 ENV DEFAULT_CATTLE_MACHINE_EXECUTE true
 ENV DEFAULT_CATTLE_COMPOSE_EXECUTOR_EXECUTE true
 ENV DEFAULT_CATTLE_CATALOG_EXECUTE true
+ENV CATTLE_RANCHER_SERVER_IMAGE rancher/server
 
 CMD ["/usr/bin/s6-svscan", "/service"]

server/build-image.sh

@@ -9,8 +9,9 @@ if [ ! -e target/.done ]; then
     touch target/.done
 fi
 
-TAG=${TAG:-$(awk '/CATTLE_RANCHER_SERVER_IMAGE/{print $3}' Dockerfile)}
-IMAGE=rancher/server:${TAG}
+TAG=${TAG:-$(awk '/CATTLE_RANCHER_SERVER_VERSION/{print $3}' Dockerfile)}
+REPO=${REPO:-$(awk '/CATTLE_RANCHER_SERVER_IMAGE/{print $3}' Dockerfile)}
+IMAGE=${REPO}:${TAG}
 
 docker build -t "${IMAGE}" .