Commit 1f2261c6 authored by Darren Shepherd's avatar Darren Shepherd
Browse files

v1.2.0-pre4-rc3

No related merge requests found
Showing with 5 additions and 4 deletions
+5 -4
......@@ -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.13
ENV DEFAULT_CATTLE_API_UI_INDEX //releases.rancher.com/ui/1.2.16
ENV CATTLE_API_UI_URL //releases.rancher.com/api-ui/1.0.8
ENV CATTLE_DB_CATTLE_DATABASE mysql
ENV CATTLE_USE_LOCAL_ARTIFACTS true
......@@ -34,8 +34,8 @@ COPY target/*static.tar.gz /s6-statics/
EXPOSE 8080
ENV CATTLE_HOST_API_PROXY_MODE embedded
ENV CATTLE_RANCHER_SERVER_VERSION v1.2.0-pre4-rc2
ENV CATTLE_RANCHER_COMPOSE_VERSION v0.11.0-rc2
ENV CATTLE_RANCHER_SERVER_VERSION v1.2.0-pre4-rc3
ENV CATTLE_RANCHER_COMPOSE_VERSION v0.11.0-rc4
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
ENV DEFAULT_CATTLE_RANCHER_COMPOSE_WINDOWS_URL https://releases.rancher.com/compose/${CATTLE_RANCHER_COMPOSE_VERSION}/rancher-compose-windows-386-${CATTLE_RANCHER_COMPOSE_VERSION}.zip
......@@ -46,7 +46,7 @@ ENV DEFAULT_CATTLE_RANCHER_CLI_WINDOWS_URL https://releases.rancher.com/cli/${CA
ENV DEFAULT_CATTLE_CATALOG_URL="infra=https://github.com/rancher/infra-catalog.git,library=https://github.com/rancher/rancher-catalog.git,community=https://github.com/rancher/community-catalog.git"
EXPOSE 3306
ENV CATTLE_CATTLE_VERSION v0.170.1
ENV CATTLE_CATTLE_VERSION v0.170.2
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 && \
......@@ -66,6 +66,7 @@ ENV DEFAULT_CATTLE_API_UI_CSS_URL /api-ui/ui.min.css
ENV DEFAULT_CATTLE_MACHINE_EXECUTE true
ENV DEFAULT_CATTLE_COMPOSE_EXECUTOR_EXECUTE true
ENV DEFAULT_CATTLE_CATALOG_EXECUTE true
ENV DEFAULT_CATTLE_AUTH_SERVICE_EXECUTE true
ENV CATTLE_RANCHER_SERVER_IMAGE rancher/server
CMD ["/usr/bin/s6-svscan", "/service"]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment