Skip to content

Commit af5a4b7

Browse files
fix: update AzureContainerLinux image reference (#8446)
Signed-off-by: Aadhar Agarwal <aadagarwal@microsoft.com>
1 parent 40c8286 commit af5a4b7

3 files changed

Lines changed: 17 additions & 12 deletions

File tree

.pipelines/.vsts-vhd-builder-release.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -869,9 +869,9 @@ stages:
869869
echo '##vso[task.setvariable variable=ENABLE_FIPS]false'
870870
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
871871
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
872-
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]035db282-f1c8-4ce7-b78f-2a7265d5398c-ACLDEVEL'
873-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]aclpreview'
874-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]0.20260318.1072691'
872+
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]b3e01d89-bd55-414f-bbb4-cdfeb2628caa-ACL'
873+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl'
874+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]3.0.20260401'
875875
displayName: Setup Build Variables
876876
- template: ./templates/.builder-release-template.yaml
877877
parameters:
@@ -893,9 +893,9 @@ stages:
893893
echo '##vso[task.setvariable variable=ENABLE_FIPS]false'
894894
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
895895
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
896-
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]035db282-f1c8-4ce7-b78f-2a7265d5398c-ACLDEVEL'
897-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]aclpreview-arm64'
898-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]0.20260318.1072692'
896+
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]b3e01d89-bd55-414f-bbb4-cdfeb2628caa-ACL'
897+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-arm64'
898+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]3.0.20260401'
899899
displayName: Setup Build Variables
900900
- template: ./templates/.builder-release-template.yaml
901901
parameters:

.pipelines/.vsts-vhd-builder.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ stages:
216216
echo '##vso[task.setvariable variable=ENABLE_FIPS]false'
217217
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
218218
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
219-
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]035db282-f1c8-4ce7-b78f-2a7265d5398c-ACLDEVEL'
220-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]aclpreview'
221-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]0.20260318.1072691'
219+
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]b3e01d89-bd55-414f-bbb4-cdfeb2628caa-ACL'
220+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl'
221+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]3.0.20260401'
222222
displayName: Setup Build Variables
223223
- template: ./templates/.builder-release-template.yaml
224224
parameters:
@@ -237,9 +237,9 @@ stages:
237237
echo '##vso[task.setvariable variable=ENABLE_FIPS]false'
238238
echo '##vso[task.setvariable variable=ENABLE_TRUSTED_LAUNCH]True'
239239
echo '##vso[task.setvariable variable=ENABLE_CGROUPV2]True'
240-
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]035db282-f1c8-4ce7-b78f-2a7265d5398c-ACLDEVEL'
241-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]aclpreview-arm64'
242-
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]0.20260318.1072692'
240+
echo '##vso[task.setvariable variable=SIG_SOURCE_GALLERY_UNIQUE_NAME]b3e01d89-bd55-414f-bbb4-cdfeb2628caa-ACL'
241+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_NAME]acl-arm64'
242+
echo '##vso[task.setvariable variable=SIG_SOURCE_IMAGE_VERSION]3.0.20260401'
243243
displayName: Setup Build Variables
244244
- template: ./templates/.builder-release-template.yaml
245245
parameters:

vhdbuilder/packer/cleanup-vhd.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@ rm -rf /var/log/stunnel4/ /etc/logrotate.d/stunnel4
1212
rm -f /etc/machine-id
1313
touch /etc/machine-id
1414
chmod 644 /etc/machine-id
15+
# Restore the UKI firstboot addon consumed by ignition-quench during this build
16+
# Without this, VMs created from this VHD won't get flatcar.first_boot=detected on the kernel cmdline
17+
if [ -f /boot/acl/uki-addons/firstboot.addon.efi ] && [ ! -f /boot/EFI/Linux/acl.efi.extra.d/firstboot.addon.efi ]; then
18+
install -D -m 0644 /boot/acl/uki-addons/firstboot.addon.efi /boot/EFI/Linux/acl.efi.extra.d/firstboot.addon.efi
19+
fi
1520
# Cleanup disk usage diagnostics file (created by generate-disk-usage.sh)
1621
rm -f /opt/azure/disk-usage.txt
1722
# remove image-fetcher binary from the image since it's only needed during build and is not expected to be present on the final image

0 commit comments

Comments
 (0)