V2.7 fix docker default dev server-version (rancher#47545)

* add version arg on dockerfile * add version arg on dockerfile
brudnak · Oct 14, 2024 · cdb80e8 · cdb80e8
1 parent f7a3324
commit cdb80e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -43,6 +43,7 @@ ARG CHART_DEFAULT_BRANCH=dev-v2.7
 ARG PARTNER_CHART_DEFAULT_BRANCH=main
 ARG RKE2_CHART_DEFAULT_BRANCH=main
 # kontainer-driver-metadata branch to be set for specific branch other than dev/master, logic at rancher/rancher/pkg/settings/setting.go
+ARG VERSION=${VERSION}
 ARG CATTLE_KDM_BRANCH=dev-v2.7
 
 ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH

diff --git a/package/Dockerfile.agent b/package/Dockerfile.agent
@@ -38,7 +38,7 @@ ENV LOGLEVEL_VERSION v0.1.6
 
 RUN curl -sLf https://github.com/rancher/loglevel/releases/download/${LOGLEVEL_VERSION}/loglevel-${ARCH}-${LOGLEVEL_VERSION}.tar.gz | tar xvzf - -C /usr/bin
 
-ARG VERSION=dev
+ARG VERSION=${VERSION}
 LABEL io.cattle.agent true
 ENV AGENT_IMAGE rancher/rancher-agent:${VERSION}
 ENV CATTLE_RANCHER_WEBHOOK_MIN_VERSION=''