From db9fafa2177a3838d19f5565d4389b4c155b0027 Mon Sep 17 00:00:00 2001 From: niusmallnan Date: Fri, 6 Aug 2021 14:32:23 +0800 Subject: [PATCH] Bump UI and steve to 2.6 baseline --- Dockerfile.dapper | 6 +++--- scripts/download | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.dapper b/Dockerfile.dapper index 128cb02..f3fecaa 100644 --- a/Dockerfile.dapper +++ b/Dockerfile.dapper @@ -19,10 +19,10 @@ ENV DOCKER_URL_amd64=https://get.docker.com/builds/Linux/x86_64/docker-1.10.3 \ DOCKER_URL=DOCKER_URL_${ARCH} RUN wget -O - ${!DOCKER_URL} > /usr/bin/docker && chmod +x /usr/bin/docker -ENV GIT_COMMIT="327be56d3a6a2b85cf4751148f6834402e8211d5" \ - GIT_BRANCH="kube-explorer" \ +ENV GIT_COMMIT="eb573e2af86fa4328b9dde3a195e02a710dfa5fe" \ + GIT_BRANCH="ke/v0.2" \ GIT_SOURCE="/go/src/github.com/rancher/steve" \ - CATTLE_DASHBOARD_UI_VERSION=v2.5.8-cn + CATTLE_DASHBOARD_UI_VERSION=v2.6.0-ent-rc1 ENV DAPPER_ENV REPO TAG DRONE_TAG CROSS ENV DAPPER_SOURCE /opt/kube-explorer diff --git a/scripts/download b/scripts/download index e8e323e..67c8368 100755 --- a/scripts/download +++ b/scripts/download @@ -10,7 +10,7 @@ git reset --hard ${GIT_COMMIT} mkdir -p pkg/ui/ui/dashboard cd pkg/ui/ui/dashboard -curl -sL https://rancher-dashboard-ui.s3.ap-southeast-2.amazonaws.com/release-2.5/${CATTLE_DASHBOARD_UI_VERSION}.tar.gz | tar xvzf - --strip-components=2 +curl -sL https://rancher-dashboard-ui.s3.ap-southeast-2.amazonaws.com/release-2.6/${CATTLE_DASHBOARD_UI_VERSION}.tar.gz | tar xvzf - --strip-components=2 cp index.html ../index.html popd