Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Rancher
Commits
32b9e29d
Commit
32b9e29d
authored
5 years ago
by
Denise Schannon
Committed by
Denise
5 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Set system chart branch to dev-v2.5
parent
0479de20
master
2.4-head
2.5-head
aecdb0589
ansilh-cs-status-logging
bump_machine_version
cfbd0d3
cloudnautique-patch-1
clusterapi-controller
cwarren/automate_private_registry_1
dev
dnoland1-cores-metric-patch
dnoland1-patch-1
dnoland1-patch-2
dnoland1-patch-3
dnoland1-patch-4
fixmonitoringtime
kinarashah-patch-1
mrajashree-patch-1
not-release/v2.5.11
paynejacob-patch-1
paynejacob-patch-1-1
rc-19
release/v1.1
release/v2.5
release/v2.5.11
release/v2.5.11-alt
release/v2.5.11-patch1
release/v2.5.3
release/v2.5.5
release/v2.5.7
release/v2.5.7-patch1
release/v2.5.8
release/v2.5.8-patch1
release/v2.5.8-patch2
release/v2.5.8-patch3
release/v2.5.8-rc1
release/v2.5.9
release/v2.5.9-debug1
release/v2.6
release/v2.6.2
revert-26644-lasso
revert-29888-revert-ingress-version-fwd
revert-29936-fleet-gitjob-proxy-support
revert-30671-release/v2.5
revert-30698-revert-30671-release/v2.5
revert-31102-restrictedadminrancher
revert-31118-fwd_restrictedadmin
revert-35793-temporarily-disable-fossa
snyk-fix-0564176c790784e319dbf499a8a4b2b8
update-issue-templates
Tags unavailable
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
package/Dockerfile
+1
-1
package/Dockerfile
scripts/package
+1
-1
scripts/package
with
2 additions
and
2 deletions
+2
-2
package/Dockerfile
+
1
-
1
View file @
32b9e29d
...
...
@@ -13,7 +13,7 @@ WORKDIR /var/lib/rancher
ARG
ARCH=amd64
ARG
IMAGE_REPO=rancher
ARG
SYSTEM_CHART_DEFAULT_BRANCH=dev
ARG
SYSTEM_CHART_DEFAULT_BRANCH=dev
-v2.5
ARG
DASHBOARD_BRANCH=latest
# kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go
ARG
RANCHER_METADATA_BRANCH=dev-v2.5
...
...
This diff is collapsed.
Click to expand it.
scripts/package
+
1
-
1
View file @
32b9e29d
...
...
@@ -4,7 +4,7 @@ set -e
source
$(
dirname
$0
)
/version
ARCH
=
${
ARCH
:-
"amd64"
}
SYSTEM_CHART_DEFAULT_BRANCH
=
${
SYSTEM_CHART_DEFAULT_BRANCH
:-
"dev"
}
SYSTEM_CHART_DEFAULT_BRANCH
=
${
SYSTEM_CHART_DEFAULT_BRANCH
:-
"dev
-v2.5
"
}
SUFFIX
=
""
[
"
${
ARCH
}
"
!=
"amd64"
]
&&
SUFFIX
=
"_
${
ARCH
}
"
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help