diff --git a/src/fedora/39/amd64/Dockerfile b/src/fedora/39/amd64/Dockerfile index ffd09c41f..2320d1403 100644 --- 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 deleted file mode 100644 index 6e319d453..000000000 --- a/src/fedora/39/amd64/microsoft.asc +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT -LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV -7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag -OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j -H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr -M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs -ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC -AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH -/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe -MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy -7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV -KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ -XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+ -NdCFTW7wY0Fb1fWJ+/KTsC4= -=J6gs ------END PGP PUBLIC KEY BLOCK----- diff --git a/src/fedora/40/amd64/Dockerfile b/src/fedora/40/amd64/Dockerfile index 29df1548d..aa056e79e 100644 --- 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 deleted file mode 100644 index 6e319d453..000000000 --- a/src/fedora/40/amd64/microsoft.asc +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1.4.7 (GNU/Linux) - -mQENBFYxWIwBCADAKoZhZlJxGNGWzqV+1OG1xiQeoowKhssGAKvd+buXCGISZJwT -LXZqIcIiLP7pqdcZWtE9bSc7yBY2MalDp9Liu0KekywQ6VVX1T72NPf5Ev6x6DLV -7aVWsCzUAF+eb7DC9fPuFLEdxmOEYoPjzrQ7cCnSV4JQxAqhU4T6OjbvRazGl3ag -OeizPXmRljMtUUttHQZnRhtlzkmwIrUivbfFPD+fEoHJ1+uIdfOzZX8/oKHKLe2j -H632kvsNzJFlROVvGLYAk2WRcLu+RjjggixhwiB+Mu/A8Tf4V6b+YppS44q8EvVr -M+QvY7LNSOffSO6Slsy9oisGTdfE39nC7pVRABEBAAG0N01pY3Jvc29mdCAoUmVs -ZWFzZSBzaWduaW5nKSA8Z3Bnc2VjdXJpdHlAbWljcm9zb2Z0LmNvbT6JATUEEwEC -AB8FAlYxWIwCGwMGCwkIBwMCBBUCCAMDFgIBAh4BAheAAAoJEOs+lK2+EinPGpsH -/32vKy29Hg51H9dfFJMx0/a/F+5vKeCeVqimvyTM04C+XENNuSbYZ3eRPHGHFLqe -MNGxsfb7C7ZxEeW7J/vSzRgHxm7ZvESisUYRFq2sgkJ+HFERNrqfci45bdhmrUsy -7SWw9ybxdFOkuQoyKD3tBmiGfONQMlBaOMWdAsic965rvJsd5zYaZZFI1UwTkFXV -KJt3bp3Ngn1vEYXwijGTa+FXz6GLHueJwF0I7ug34DgUkAFvAs8Hacr2DRYxL5RJ -XdNgj4Jd2/g6T9InmWT0hASljur+dJnzNiNCkbn9KbX7J/qK1IbR8y560yRmFsU+ -NdCFTW7wY0Fb1fWJ+/KTsC4= -=J6gs ------END PGP PUBLIC KEY BLOCK----- diff --git a/src/fedora/41/amd64/Dockerfile b/src/fedora/41/amd64/Dockerfile new file mode 100644 index 000000000..b8e52544e --- /dev/null +++ b/src/fedora/41/amd64/Dockerfile @@ -0,0 +1,82 @@ +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 dnf config-manager addrepo --from-repofile=https://packages.microsoft.com/fedora/41/prod/config.repo + +# 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 index b67cb3a40..89f823b96 100644 --- 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": {} + } + } + ] } ] }