Change system chart build params

smallteeths · May 16, 2019 · bcd07e3 · bcd07e3
1 parent 3bd26df
commit bcd07e3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -84,7 +84,6 @@ steps:
     build_args:
     - ARCH=amd64
     - "VERSION=${DRONE_TAG}"
-    - SYSTEM_CHART_DEFAULT_BRANCH=master
     context: package/
     custom_dns: 1.1.1.1
     dockerfile: package/Dockerfile
@@ -268,7 +267,6 @@ steps:
     build_args:
     - ARCH=arm64
     - "VERSION=${DRONE_TAG}"
-    - SYSTEM_CHART_DEFAULT_BRANCH=master
     context: package/
     custom_dns: 1.1.1.1
     dockerfile: package/Dockerfile

diff --git a/package/Dockerfile b/package/Dockerfile
@@ -13,7 +13,7 @@ WORKDIR /var/lib/rancher
 
 ARG ARCH=amd64
 ARG IMAGE_REPO=rancher
-ARG SYSTEM_CHART_DEFAULT_BRANCH
+ARG SYSTEM_CHART_DEFAULT_BRANCH=release-v2.2
 
 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH
 ENV CATTLE_HELM_VERSION v2.10.0-rancher10

diff --git a/scripts/package b/scripts/package
@@ -4,7 +4,7 @@ set -e
 source $(dirname $0)/version
 
 ARCH=${ARCH:-"amd64"}
-SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"master"}
+SYSTEM_CHART_DEFAULT_BRANCH=${SYSTEM_CHART_DEFAULT_BRANCH:-"dev"}
 SUFFIX=""
 [ "${ARCH}" != "amd64" ] && SUFFIX="_${ARCH}"