Skip to content

Commit 31b0898

Browse files
author
Roy Hopkins
committed
CvmImageBuilder: Use Ubuntu 24 Evidence SDK version
Update the CvmImageBuilder script to get the Evidence SDK from the Ubuntu 24 insiders-fast repo.
1 parent 7153bd3 commit 31b0898

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

ConfidentialComputing/CvmImageBuilder/build-cvm-image.sh

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ apt install -y ca-certificates wget apt-transport-https lsb-release gnupg
117117
118118
TMPDIR=$(mktemp -d)
119119
trap 'rm -rf "$TMPDIR"' EXIT
120+
mkdir -p /usr/share/keyrings
120121
121122
# Legacy key (pre-Spring 2025 repos)
122123
wget -q https://packages.microsoft.com/keys/microsoft.asc -O "$TMPDIR/microsoft.asc"
@@ -125,7 +126,8 @@ if [ "$ACTUAL" != "2fa9c05d591a1582a9aba276272478c262e95ad00acf60eaee1644d93941e
125126
echo "SHA256 mismatch for microsoft.asc!" >&2; exit 1
126127
fi
127128
gpg --dearmor "$TMPDIR/microsoft.asc"
128-
mv "$TMPDIR/microsoft.asc.gpg" /etc/apt/trusted.gpg.d/
129+
cp "$TMPDIR/microsoft.asc.gpg" /etc/apt/trusted.gpg.d/
130+
mv "$TMPDIR/microsoft.asc.gpg" /usr/share/keyrings/microsoft-prod.gpg
129131
130132
# Current key (Spring 2025+ repos)
131133
wget -q https://packages.microsoft.com/keys/microsoft-2025.asc -O "$TMPDIR/microsoft-2025.asc"
@@ -134,7 +136,8 @@ if [ "$ACTUAL" != "d45224d594d969f084232deaaf97c58ca502a9d964c362d7aaef5a76e16b3
134136
echo "SHA256 mismatch for microsoft-2025.asc!" >&2; exit 1
135137
fi
136138
gpg --dearmor "$TMPDIR/microsoft-2025.asc"
137-
mv "$TMPDIR/microsoft-2025.asc.gpg" /etc/apt/trusted.gpg.d/
139+
cp "$TMPDIR/microsoft-2025.asc.gpg" /etc/apt/trusted.gpg.d/
140+
mv "$TMPDIR/microsoft-2025.asc.gpg" /usr/share/keyrings/microsoft-prod-2025.gpg
138141
KEY_EOF
139142

140143
if [[ "$INSIDER_FAST" == "true" ]]; then
@@ -146,13 +149,12 @@ TMPDIR=$(mktemp -d)
146149
trap 'rm -rf "$TMPDIR"' EXIT
147150
148151
# Add insiders-fast apt source
149-
# Note the evidence SDK is only published to 22.04 at the moment, this should be updated with future releases.
150-
wget -q https://packages.microsoft.com/config/ubuntu/22.04/insiders-fast.list -O "$TMPDIR/insiders-fast.list"
152+
wget -q https://packages.microsoft.com/config/ubuntu/24.04/insiders-fast.list -O "$TMPDIR/insiders-fast.list"
151153
ACTUAL=$(sha256sum "$TMPDIR/insiders-fast.list" | awk '{print $1}')
152-
if [ "$ACTUAL" != "2d7bf753c6036b8e894c93a65b0ce669906ebe54ba2db7107900e7e99ae47712" ]; then
154+
if [ "$ACTUAL" != "6106538850c7fbb89616393aa7a9ed1094e653603a1b76dd4d7512417cfb6cf8" ]; then
153155
echo "SHA256 mismatch for insiders-fast.list!" >&2; exit 1
154156
fi
155-
cp "$TMPDIR/insiders-fast.list" /etc/apt/sources.list.d/microsoft-insiders-fast.list
157+
mv "$TMPDIR/insiders-fast.list" /etc/apt/sources.list.d/microsoft-insiders-fast.list
156158
INSIDER_EOF
157159
fi
158160

0 commit comments

Comments
 (0)