Merge remote-tracking branch 'upstream/main' into juhoyosa/add-llvm-t…

…o-helix-containers

README.md

@@ -6,8 +6,7 @@ The Dockerfiles in this repository are used for building the .NET Core product.
 
 The images produced from the Dockerfiles are published to the mcr.microsoft.com/dotnet-buildtools/prereqs Docker repository.
 
-  - [Latest tags (production)](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-production.json)
-  - [Latest tags (staging)](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json)
+  - [Latest tags](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json)
   - [Full list of tags](https://mcr.microsoft.com/v2/dotnet-buildtools/prereqs/tags/list)
 
 ## How to identify an image

eng/pipelines/dotnet-buildtools-prereqs-all-pr.yml

@@ -1,8 +1,5 @@
 trigger: none
-pr: 
-  branches:
-    include:
-    - production
+pr: none
 
 resources:
   repositories:

eng/pipelines/dotnet-buildtools-prereqs-all.yml

@@ -1,7 +1,4 @@
-trigger: 
-  branches:
-    include:
-    - production
+trigger: none
 pr: none
 
 resources:
@@ -36,4 +33,4 @@ stages:
           variableName: imageBuilderBuildArgs
           dockerfileOs: (centos|debian|ubuntu)
           baseOverrideRegistry: $(overrideRegistry) # Comes from DotNet-Docker-Common variable group
-    
+

eng/pipelines/variables/common.yml

@@ -2,7 +2,7 @@ variables:
 - template: ../../common/templates/variables/dotnet/build-test-publish.yml
 - name: officialBranches
   # comma-delimited list of branch names
-  value: main,production
+  value: main
 - name: manifest
   value: manifest.json
 - name: dotnetVersion
@@ -15,27 +15,16 @@ variables:
   value: ''
 - name: publicGitRepoUri
   value: https://github.com/dotnet/dotnet-buildtools-prereqs-docker
-- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/production') }}:
-  # See https://github.com/dotnet/dotnet-buildtools-prereqs-docker/pull/814 for why the value for this is blank.
-  # If/When we get back to flowing changes to production, we will want to change this back to -staging
-  - name: floatingTagSuffix
-    value: ""
-- ${{ elseif eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
+- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
   - name: floatingTagSuffix
     value: ""
 - ${{ else }}:
   - name: floatingTagSuffix
     value: $(Build.SourceBranchName)
 - name: manifestVariables
   value: --var UniqueId=$(sourceBuildId) --var FloatingTagSuffix=$(floatingTagSuffix)
-- ${{ if or(eq(variables['Build.SourceBranch'], 'refs/heads/production'), eq(variables['System.PullRequest.TargetBranch'], 'production')) }}:
-  - name: publicSourceBranch
-    value: production
-  - name: noCache
-    value: true
-- ${{ else }}:
-  - name: publicSourceBranch
-    value: main
+- name: publicSourceBranch
+  value: main
 - name: ingestKustoImageInfo
   value: false
 - name: testScriptPath

src/alpine/manifest.json

@@ -88,21 +88,6 @@
             }
           ]
         },
-        {
-          "platforms": [
-            {
-              "architecture": "arm",
-              "dockerfile": "src/alpine/3.16/helix/arm32v7",
-              "os": "linux",
-              "osVersion": "alpine3.16",
-              "tags": {
-                "alpine-3.16-helix-arm32v7-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.16-helix-arm32v7$(FloatingTagSuffix)": {}
-              },
-              "variant": "v7"
-            }
-          ]
-        },
         {
           "platforms": [
             {

src/cbl-mariner/2.0/webassembly/Dockerfile

@@ -39,7 +39,7 @@ RUN curl -sSL https://netcorenativeassets.blob.core.windows.net/resource-package
     && chmod +x /usr/local/bin/v8
 
 # Install Wasi toolchain
-ENV WASI_SDK_VERSION=20
+ENV WASI_SDK_VERSION=21
 ENV WASI_SDK_PATH=/usr/local/wasi-sdk
 ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz
 

src/ubuntu/20.04/webassembly/Dockerfile

@@ -49,7 +49,7 @@ RUN curl -sSL https://netcorenativeassets.blob.core.windows.net/resource-package
     && chmod +x /usr/local/bin/v8
 
 # Install Wasi toolchain
-ENV WASI_SDK_VERSION=20
+ENV WASI_SDK_VERSION=21
 ENV WASI_SDK_PATH=/usr/local/wasi-sdk
 ENV WASI_SDK_URL=https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-${WASI_SDK_VERSION}/wasi-sdk-${WASI_SDK_VERSION}.0-linux.tar.gz
 

src/ubuntu/22.04/cross/armel-tizen/Dockerfile

@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps-local AS builder
+ARG ROOTFS_DIR=/crossrootfs/armel
+
+# Obtain arcade scripts used to build rootfs
+RUN git config --global user.email builder@dotnet-buildtools-prereqs-docker && \
+    git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts
+
+RUN /scripts/eng/common/cross/tizen-build-rootfs.sh armel
+
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps-local
+ARG ROOTFS_DIR=/crossrootfs/armel
+
+# Install binutils-arm-linux-gnueabi
+RUN apt-get update \
+    && apt-get install -y \
+        binutils-arm-linux-gnueabi \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=builder $ROOTFS_DIR $ROOTFS_DIR

src/ubuntu/manifest.json

@@ -671,6 +671,19 @@
             }
           ]
         },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/ubuntu/22.04/cross/armel-tizen",
+              "os": "linux",
+              "osVersion": "bionic",
+              "tags": {
+                "ubuntu-22.04-cross-armel-tizen-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
+                "ubuntu-22.04-cross-armel-tizen$(FloatingTagSuffix)": {}
+              }
+            }
+          ]
+        },
         {
           "platforms": [
             {