Skip to content

Commit

Permalink
reverting some changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasSUSE committed Aug 13, 2024
1 parent b0293d9 commit 809924d
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions package/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ FROM registry.suse.com/bci/bci-base:15.5
# Install some packages with zypper in the chroot of the final micro image
RUN zypper -n install --no-recommends git-core curl ca-certificates unzip xz gzip sed tar shadow gawk vim-small netcat-openbsd mkisofs openssh-clients && \
zypper -n clean -a && rm -rf /tmp/* /var/tmp/* /usr/share/doc/packages/* && \

RUN useradd rancher && \
useradd rancher && \
mkdir -p /var/lib/rancher /var/lib/cattle /opt/jail /opt/drivers/management-state/bin && \
chown -R rancher /var/lib/rancher /var/lib/cattle /usr/local/bin

Expand All @@ -40,8 +39,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 CATTLE_KDM_BRANCH=release-v2.7
ARG VERSION=${VERSION}
ARG CATTLE_KDM_BRANCH=dev-v2.7

ENV CATTLE_SYSTEM_CHART_DEFAULT_BRANCH=$SYSTEM_CHART_DEFAULT_BRANCH
ENV CATTLE_CHART_DEFAULT_BRANCH=$CHART_DEFAULT_BRANCH
Expand Down Expand Up @@ -76,7 +74,7 @@ ENV CATTLE_SYSTEM_AGENT_INSTALLER_IMAGE rancher/system-agent-installer-
# make sure the ENV CATTLE_SYSTEM_AGENT_INSTALL_SCRIPT is consistent with pkg/settings/setting.go to utlize the local version of install script downloaded during build/package
ENV CATTLE_SYSTEM_AGENT_INSTALL_SCRIPT ${CATTLE_SYSTEM_AGENT_DOWNLOAD_PREFIX}/${CATTLE_SYSTEM_AGENT_VERSION}/install.sh
ENV CATTLE_SYSTEM_AGENT_UNINSTALL_SCRIPT ${CATTLE_SYSTEM_AGENT_DOWNLOAD_PREFIX}/${CATTLE_SYSTEM_AGENT_VERSION}/system-agent-uninstall.sh
ENV CATTLE_SYSTEM_UPGRADE_CONTROLLER_CHART_VERSION 103.0.1+up0.6.0
ENV CATTLE_SYSTEM_UPGRADE_CONTROLLER_CHART_VERSION 102.2.0+up0.6.0

# System charts minimal version
ENV CATTLE_FLEET_MIN_VERSION=102.2.7+up0.8.6-rc.3
Expand Down

0 comments on commit 809924d

Please sign in to comment.