Elgato_dark/Olares
1
0
Fork 0
mirror of https://github.com/beclab/Olares synced 2026-04-21 13:37:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(cli): allow release version ovverride for local test

Browse source
This commit is contained in:
dkeven 2026-04-16 15:49:54 +08:00
parent 47329d4563
commit 23d5ff8df4
3 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/base-package/install.sh
View file

@ -19,6 +19,7 @@ if [[ x"$VERSION" == x"" ]]; then
if [[ "$LOCAL_RELEASE" == "1" ]]; then
ts=$(date +%Y%m%d%H%M%S)
export VERSION="1.12.7-$ts"
export OLARES_LOCAL_RELEASE_VERSION_OVERRIDE=$VERSION
echo "will build and use a local release of Olares with version: $VERSION"
echo ""
else

23
cli/pkg/common/common.go
View file

@ -221,17 +221,18 @@ const (
)
const (
ENV_OLARES_BASE_DIR = "OLARES_BASE_DIR"
ENV_OLARES_VERSION = "OLARES_VERSION"
ENV_TERMINUS_IS_CLOUD_VERSION = "TERMINUS_IS_CLOUD_VERSION"
ENV_KUBE_TYPE = "KUBE_TYPE"
ENV_OLARES_CDN_SERVICE = "OLARES_SYSTEM_CDN_SERVICE"
ENV_LOCAL_GPU_ENABLE = "LOCAL_GPU_ENABLE"
ENV_HOST_IP = "HOST_IP"
ENV_PREINSTALL = "PREINSTALL"
ENV_DISABLE_HOST_IP_PROMPT = "DISABLE_HOST_IP_PROMPT"
ENV_AUTO_ADD_FIREWALL_RULES = "AUTO_ADD_FIREWALL_RULES"
ENV_DEFAULT_WSL_DISTRO_LOCATION = "DEFAULT_WSL_DISTRO_LOCATION" // If set to 1, the default WSL distro storage will be used.
ENV_OLARES_BASE_DIR = "OLARES_BASE_DIR"
ENV_OLARES_VERSION = "OLARES_VERSION"
ENV_LOCAL_RELEASE_VERSION_OVERRIDE = "LOCAL_RELEASE_VERSION_OVERRIDE"
ENV_TERMINUS_IS_CLOUD_VERSION = "TERMINUS_IS_CLOUD_VERSION"
ENV_KUBE_TYPE = "KUBE_TYPE"
ENV_OLARES_CDN_SERVICE = "OLARES_SYSTEM_CDN_SERVICE"
ENV_LOCAL_GPU_ENABLE = "LOCAL_GPU_ENABLE"
ENV_HOST_IP = "HOST_IP"
ENV_PREINSTALL = "PREINSTALL"
ENV_DISABLE_HOST_IP_PROMPT = "DISABLE_HOST_IP_PROMPT"
ENV_AUTO_ADD_FIREWALL_RULES = "AUTO_ADD_FIREWALL_RULES"
ENV_DEFAULT_WSL_DISTRO_LOCATION = "DEFAULT_WSL_DISTRO_LOCATION" // If set to 1, the default WSL distro storage will be used.
ENV_CONTAINER_MODE = "CONTAINER_MODE" // running in docker container

3
cli/pkg/common/kube_runtime.go
View file

@ -293,6 +293,9 @@ func (a *Argument) SetGPU(enable bool) {
}
func (a *Argument) SetOlaresVersion(version string) {
if viper.GetString(ENV_LOCAL_RELEASE_VERSION_OVERRIDE) != "" {
version = viper.GetString(ENV_LOCAL_RELEASE_VERSION_OVERRIDE)
}
if version == "" || len(version) <= 2 {
return
}