Add an Fedora 41 amd64 image

dotnet · Oct 16, 2024 · 51e3518 · 51e3518
1 parent bd4294f
commit 51e3518
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 66 deletions.
diff --git a/src/fedora/39/amd64/Dockerfile b/src/fedora/39/amd64/Dockerfile
@@ -19,10 +19,8 @@ RUN dnf --setopt=install_weak_deps=False install -y \
     && dnf clean all
 
 # Add MS package repo.
-COPY  microsoft.asc /tmp
-RUN dnf config-manager --add-repo https://packages.microsoft.com/fedora/39/prod/ && \
-    rpm --import /tmp/microsoft.asc && \
-    rm /tmp/microsoft.asc
+RUN dnf config-manager --add-repo https://packages.microsoft.com/fedora/39/prod/ \
+    && rpm --import https://packages.microsoft.com/keys/microsoft.asc
 
 # Install tools used by build automation.
 RUN dnf --setopt=install_weak_deps=False install -y \
@@ -76,7 +74,9 @@ RUN dnf --setopt=install_weak_deps=False install -y \
     && dnf clean all
 
 # Dependencies for Aspnetcore
-RUN cd ~ && \ 
-    curl -sL https://rpm.nodesource.com/setup_20.x
-RUN dnf install -y nodejs && dnf clean all
+RUN cd ~ \
+    && curl -sL https://rpm.nodesource.com/setup_20.x
+RUN dnf --setopt=install_weak_deps=False install -y \
+        nodejs \
+    && dnf clean all
 ENV NO_UPDATE_NOTIFIER=true
diff --git a/src/fedora/39/amd64/microsoft.asc b/src/fedora/39/amd64/microsoft.asc
diff --git a/src/fedora/40/amd64/Dockerfile b/src/fedora/40/amd64/Dockerfile
@@ -19,10 +19,8 @@ RUN dnf --setopt=install_weak_deps=False install -y \
     && dnf clean all
 
 # Add MS package repo.
-COPY  microsoft.asc /tmp
-RUN dnf config-manager --add-repo https://packages.microsoft.com/fedora/40/prod/ && \
-    rpm --import /tmp/microsoft.asc && \
-    rm /tmp/microsoft.asc
+RUN dnf config-manager --add-repo https://packages.microsoft.com/fedora/40/prod/ \
+    && rpm --import https://packages.microsoft.com/keys/microsoft.asc
 
 # Install tools used by build automation.
 RUN dnf --setopt=install_weak_deps=False install -y \
@@ -77,7 +75,9 @@ RUN dnf --setopt=install_weak_deps=False install -y \
     && dnf clean all
 
 # Dependencies for Aspnetcore
-RUN cd ~ && \
-    curl -sL https://rpm.nodesource.com/setup_20.x
-RUN dnf install -y nodejs && dnf clean all
+RUN cd ~ \
+    && curl -sL https://rpm.nodesource.com/setup_20.x
+RUN dnf --setopt=install_weak_deps=False install -y \
+        nodejs \
+    && dnf clean all
 ENV NO_UPDATE_NOTIFIER=true
diff --git a/src/fedora/40/amd64/microsoft.asc b/src/fedora/40/amd64/microsoft.asc
diff --git a/src/fedora/41/amd64/Dockerfile b/src/fedora/41/amd64/Dockerfile
@@ -0,0 +1,88 @@
+FROM library/fedora:41
+
+# Install the base toolchain we need to build anything (clang, cmake, make and the like)
+# this does not include libraries that we need to compile different projects, we'd like
+# them in a different layer.
+RUN dnf --setopt=install_weak_deps=False install -y \
+        clang \
+        cmake \
+        dnf-plugins-core \
+        findutils \
+        gdb \
+        glibc-langpack-en \
+        lldb-devel \
+        llvm-devel \
+        make \
+        pigz \
+        python \
+        which \
+    && dnf clean all
+
+# Add MS package repo.
+RUN dnf5 config-manager addrepo \
+        --set=name=Microsoft \
+        --set=baseurl=https://packages.microsoft.com/fedora/41/prod/ \
+        --set=enabled=1 \
+        --set=gpgcheck=1 \
+        --set=gpgkey=https://packages.microsoft.com/keys/microsoft.asc \
+    && dnf makecache
+
+# Install tools used by build automation.
+RUN dnf --setopt=install_weak_deps=False install -y \
+        azure-cli \
+        git \
+        jq \
+        tar \
+        procps \
+        zip \
+    && dnf clean all
+
+# Install the latest non-preview powershell release.
+RUN LATEST_TAG=$(curl -L https://api.github.com/repos/powershell/powershell/releases/latest | jq -r '.tag_name') \
+    && curl -L https://github.com/PowerShell/PowerShell/releases/download/$LATEST_TAG/powershell-${LATEST_TAG#*v}-linux-x64.tar.gz -o /tmp/powershell.tar.gz \
+    && mkdir -p /opt/microsoft/powershell \
+    && tar zxf /tmp/powershell.tar.gz -C /opt/microsoft/powershell \
+    && chmod +x /opt/microsoft/powershell/pwsh \
+    && ln -s /opt/microsoft/powershell/pwsh /usr/bin/pwsh \
+    && rm -f /tmp/powershell.tar.gz
+
+# Dependencies of CoreCLR, Mono and CoreFX.
+RUN dnf --setopt=install_weak_deps=False install -y \
+        autoconf \
+        automake \
+        brotli-devel \
+        glibc-locale-source \
+        iputils \
+        jq \
+        krb5-devel \
+        libcurl-devel \
+        libgdiplus \
+        libicu-devel \
+        libomp-devel \
+        libtool \
+        libunwind-devel \
+        libuuid-devel \
+        lttng-ust-devel \
+        openssl-devel \
+        uuid-devel \
+        zlib-devel \
+    && dnf clean all
+
+# Dependencies for VMR/source-build tests
+RUN dnf --setopt=install_weak_deps=False install -y \
+        elfutils \
+        file \
+    && dnf clean all
+
+# Install ICU package to support globalization
+RUN dnf --setopt=install_weak_deps=False install -y \
+        icu \
+    && dnf clean all
+
+# Dependencies for Aspnetcore
+RUN cd ~ \
+    && curl -sL https://rpm.nodesource.com/setup_20.x
+RUN dnf --setopt=install_weak_deps=False install -y \
+        nodejs \
+    && dnf clean all
+ENV NO_UPDATE_NOTIFIER=true
diff --git a/src/fedora/manifest.json b/src/fedora/manifest.json
@@ -4,24 +4,40 @@
       "name": "dotnet-buildtools/prereqs",
       "images": [
         {
-          "platforms": [{
-            "dockerfile": "src/fedora/39/amd64",
-            "os": "linux",
-            "osVersion": "fedora39",
-            "tags": {
-              "fedora-39": {}
+          "platforms": [
+            {
+              "dockerfile": "src/fedora/39/amd64",
+              "os": "linux",
+              "osVersion": "fedora39",
+              "tags": {
+                "fedora-39": {}
+              }
             }
-          }]
+          ]
         },
         {
-          "platforms": [{
-            "dockerfile": "src/fedora/40/amd64",
-            "os": "linux",
-            "osVersion": "fedora40",
-            "tags": {
-              "fedora-40": {}
+          "platforms": [
+            {
+              "dockerfile": "src/fedora/40/amd64",
+              "os": "linux",
+              "osVersion": "fedora40",
+              "tags": {
+                "fedora-40": {}
+              }
             }
-          }]
+          ]
+        },
+        {
+          "platforms": [
+            {
+              "dockerfile": "src/fedora/41/amd64",
+              "os": "linux",
+              "osVersion": "fedora41",
+              "tags": {
+                "fedora-41": {}
+              }
+            }
+          ]
         }
       ]
     }