From d35c29cc79b5cbb271b6fe88d7791f5b78470b44 Mon Sep 17 00:00:00 2001 From: Phillip Rak Date: Thu, 6 Feb 2025 11:34:14 -0700 Subject: [PATCH] Revert: Pin Rancher version to v2.11-2053ce644a31cd8053d1f58e2487154b0b8513b6-head for e2e tests Signed-off-by: Phillip Rak --- package.json | 2 +- scripts/e2e-docker-start | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index d1ce8952ef..26f55bc9f5 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "install:ci": "yarn install --frozen-lockfile", "dev": "bash -c 'source ./scripts/version && NODE_ENV=dev ./node_modules/.bin/vue-cli-service serve'", "mem-dev": "bash -c 'source ./scripts/version && NODE_ENV=dev node --max-old-space-size=8192 ./node_modules/.bin/vue-cli-service serve'", - "docker:local:start": "docker run -d --restart=unless-stopped -p 80:80 -p 443:443 -e CATTLE_BOOTSTRAP_PASSWORD=password -e CATTLE_PASSWORD_MIN_LENGTH=3 --name cypress --privileged rancher/rancher:v2.11-2053ce644a31cd8053d1f58e2487154b0b8513b6-head", + "docker:local:start": "docker run -d --restart=unless-stopped -p 80:80 -p 443:443 -e CATTLE_BOOTSTRAP_PASSWORD=password -e CATTLE_PASSWORD_MIN_LENGTH=3 --name cypress --privileged rancher/rancher:head", "docker:local:stop": "docker kill cypress || true && docker rm cypress || true", "build": "NODE_OPTIONS=--max_old_space_size=4096 ./node_modules/.bin/vue-cli-service build", "build:lib": "cd pkg/rancher-components && yarn build:lib", diff --git a/scripts/e2e-docker-start b/scripts/e2e-docker-start index 299b120830..cdd69be5ba 100755 --- a/scripts/e2e-docker-start +++ b/scripts/e2e-docker-start @@ -7,7 +7,7 @@ DASHBOARD_DIST=${DIR}/dist EMBER_DIST=${DIR}/dist_ember # Image version -RANCHER_IMG_VERSION=v2.11-2053ce644a31cd8053d1f58e2487154b0b8513b6-head +RANCHER_IMG_VERSION=head # Docker volume args when mounting the locally-built UI into the container VOLUME_ARGS="-v ${DASHBOARD_DIST}:/usr/share/rancher/ui-dashboard/dashboard -v ${EMBER_DIST}:/usr/share/rancher/ui"