Attempting to use container aliases. Switched back to ubuntu image.

.vsts-ci.yml

@@ -47,6 +47,15 @@ resources:
     type: git
     name: 1ESPipelineTemplates/MicroBuildTemplate
     ref: refs/tags/release
+  containers:
+  - container: MuslArm
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+  - container: MuslX64
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
+  - container: PortableDeb
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
+  - container: PortableRpm
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
 
 extends:
   template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate
@@ -127,7 +136,7 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_musl_Release_arm
-          container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine'
+          container: MuslArm
           buildConfiguration: Release
           buildArchitecture: arm
           runtimeIdentifier: 'linux-musl-arm'
@@ -148,7 +157,7 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_musl_Release_x64
-          container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode'
+          container: MuslX64
           buildConfiguration: Release
           buildArchitecture: x64
           runtimeIdentifier: 'linux-musl-x64'
@@ -160,7 +169,7 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_Portable_Deb_Release_x64
-          container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg'
+          container: PortableDeb
           buildConfiguration: Release
           buildArchitecture: x64
           # Do not publish zips and tarballs. The linux-x64 binaries are
@@ -172,7 +181,7 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_Portable_Rpm_Release_x64
-          container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
+          container: PortableRpm
           buildConfiguration: Release
           buildArchitecture: x64
           # Do not publish zips and tarballs. The linux-x64 binaries are
@@ -184,7 +193,7 @@ extends:
         parameters:
           agentOs: Linux
           jobName: Build_Linux_Portable_Rpm_Release_Arm64
-          container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm'
+          container: PortableRpm
           buildConfiguration: Release
           buildArchitecture: arm64
           runtimeIdentifier: 'linux-arm64'

eng/build.yml

@@ -87,11 +87,9 @@ jobs:
     ${{ if eq(parameters.agentOs, 'Linux') }}:
       pool:
         name: $(DncEngInternalBuildPool)
-        image: 1es-mariner-2-pt
+        image: 1es-ubuntu-2204-pt
         os: linux
-      containers:
+      container: ${{ parameters.container }}
-        default_linux_container:
-          image: ${{ parameters.container }}
     ${{ if eq(parameters.agentOs, 'Darwin') }}:
       pool:
         name: Azure Pipelines