Adjust mke versions for 24.3 image
Change-Id: I6ce9319946baa8698292a9f88e277b56dc583acd
Related-Prod: PRODX-3456
diff --git a/mosk-images/env/24.3.sh b/mosk-images/env/24.3.sh
index 67eb89e..67ba5b8 100644
--- a/mosk-images/env/24.3.sh
+++ b/mosk-images/env/24.3.sh
@@ -1,6 +1,7 @@
-export IMAGE_BASE_URL="https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
-export IMAGE_MD5_URL="https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"
-export KERNEL_VERSION=${KERNEL_VERSION:-'5.15.0-83-generic'}
+export IMAGE_BASE_URL=${IMAGE_BASE_URL:-"https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"}
+export IMAGE_MD5_URL=${IMAGE_MD5_URL:-"https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"}
+export KERNEL_VERSION=${KERNEL_VERSION:-'5.15.0-105-generic'}
export DOCKER_EE_RELEASE=${DOCKER_EE_RELEASE:-'stable-23.0'}
export DOCKER_EE_URL=${DOCKER_EE_URL:-'https://repos.mirantis.com/ubuntu'}
-export DOCKER_UCP_IMAGE=${DOCKER_UCP_IMAGE:-'docker-dev-kaas-virtual.docker.mirantis.net/lcm/docker/ucp:3.7.2-rc1'}
+export DOCKER_UCP_IMAGE=${DOCKER_UCP_IMAGE:-'docker-dev-kaas-virtual.docker.mirantis.net/lcm/docker/ucp:3.7.8-rc1'}
+export DOCKER_UCP_PACKAGES=${DOCKER_UCP_PACKAGES:-'containerd.io==1.6.31~rc.1-2 docker-ee=5:23.0.11~3-0~ubuntu-jammy docker-ee-cli=5:23.0.11~3-0~ubuntu-jammy'}
diff --git a/mosk-images/scripts/docker.sh b/mosk-images/scripts/docker.sh
index a057c16..ad1e2c9 100644
--- a/mosk-images/scripts/docker.sh
+++ b/mosk-images/scripts/docker.sh
@@ -24,7 +24,7 @@
apt update
-DEBIAN_FRONTEND=noninteractive apt install -y docker-ee
+DEBIAN_FRONTEND=noninteractive apt install -y ${DOCKER_UCP_PACKAGES}
image_prefix=${DOCKER_UCP_IMAGE%/*}
if [[ "$image_prefix" =~ .*\.mirantis\.net* ]]; then
diff --git a/mosk-images/template.json b/mosk-images/template.json
index ce4d8d8..0594043 100644
--- a/mosk-images/template.json
+++ b/mosk-images/template.json
@@ -10,7 +10,8 @@
"kernel_version": "{{ env `KERNEL_VERSION` }}",
"docker_ee_release": "{{ env `DOCKER_EE_RELEASE` }}",
"docker_ee_url": "{{ env `DOCKER_EE_URL` }}",
- "docker_ucp_image": "{{ env `DOCKER_UCP_IMAGE` }}"
+ "docker_ucp_image": "{{ env `DOCKER_UCP_IMAGE` }}",
+ "docker_ucp_packages": "{{ env `DOCKER_UCP_PACKAGES` }}"
},
"provisioners": [
@@ -20,7 +21,8 @@
"KERNEL_VERSION={{user `kernel_version`}}",
"DOCKER_EE_RELEASE={{user `docker_ee_release`}}",
"DOCKER_EE_URL={{user `docker_ee_url`}}",
- "DOCKER_UCP_IMAGE={{user `docker_ucp_image`}}"
+ "DOCKER_UCP_IMAGE={{user `docker_ucp_image`}}",
+ "DOCKER_UCP_PACKAGES={{user `docker_ucp_packages`}}"
],
"scripts": [
"scripts/apt.sh",