Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dnf upgrade to Fedora images #1226

Merged
merged 2 commits into from
Oct 30, 2024
Merged

Add dnf upgrade to Fedora images #1226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
979a2ae
Add dnf upgrade to Fedora images
MichaelSimons Oct 30, 2024
2ffb559
Add back library
MichaelSimons Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 16 additions & 35 deletions src/fedora/39/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM library/fedora:39

# 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 \
RUN dnf upgrade --refresh -y \
&& dnf --setopt=install_weak_deps=False install -y \
# Base toolchain we need to build anything (clang, cmake, make and the like)
clang \
cmake \
dnf-plugins-core \
Expand All @@ -19,30 +18,17 @@ RUN dnf --setopt=install_weak_deps=False install -y \
&& dnf clean all

# Add MS package repo.
RUN dnf config-manager --add-repo https://packages.microsoft.com/fedora/39/prod/ \
&& rpm --import https://packages.microsoft.com/keys/microsoft.asc
RUN dnf config-manager --add-repo=https://packages.microsoft.com/fedora/39/prod/config.repo

# Install tools used by build automation.
RUN dnf --setopt=install_weak_deps=False install -y \
# Tools used by build automation
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 \
# Dependencies of CoreCLR, Mono and CoreFX
autoconf \
automake \
glibc-locale-source \
Expand All @@ -60,23 +46,18 @@ RUN dnf --setopt=install_weak_deps=False install -y \
openssl-devel \
uuid-devel \
zlib-devel \
&& dnf clean all

# Dependencies for VMR/source-build tests
RUN dnf --setopt=install_weak_deps=False install -y \
# Dependencies for VMR/source-build tests
elfutils \
file \
&& dnf clean all

# Install ICU package to support globalization
RUN dnf --setopt=install_weak_deps=False install -y \
# Dependencies to support globalization
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
# 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
51 changes: 16 additions & 35 deletions src/fedora/40/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
FROM library/fedora:40

# 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 \
RUN dnf upgrade --refresh -y \
&& dnf --setopt=install_weak_deps=False install -y \
# Base toolchain we need to build anything (clang, cmake, make and the like)
clang \
cmake \
dnf-plugins-core \
Expand All @@ -19,30 +18,17 @@ RUN dnf --setopt=install_weak_deps=False install -y \
&& dnf clean all

# Add MS package repo.
RUN dnf config-manager --add-repo https://packages.microsoft.com/fedora/40/prod/ \
&& rpm --import https://packages.microsoft.com/keys/microsoft.asc
RUN dnf config-manager --add-repo=https://packages.microsoft.com/fedora/40/prod/config.repo

# Install tools used by build automation.
RUN dnf --setopt=install_weak_deps=False install -y \
# Tools used by build automation
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 \
# Dependencies of CoreCLR, Mono and CoreFX
autoconf \
automake \
brotli-devel \
Expand All @@ -61,23 +47,18 @@ RUN dnf --setopt=install_weak_deps=False install -y \
openssl-devel \
uuid-devel \
zlib-devel \
&& dnf clean all

# Dependencies for VMR/source-build tests
RUN dnf --setopt=install_weak_deps=False install -y \
# Dependencies for VMR/source-build tests
elfutils \
file \
&& dnf clean all

# Install ICU package to support globalization
RUN dnf --setopt=install_weak_deps=False install -y \
# Dependencies to support globalization
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
# 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
3 changes: 2 additions & 1 deletion src/fedora/41/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ FROM library/fedora:41
# Add MS package repo.
RUN dnf config-manager addrepo --from-repofile=https://packages.microsoft.com/fedora/41/prod/config.repo

RUN dnf --setopt=install_weak_deps=False install -y \
RUN dnf upgrade --refresh -y \
&& dnf --setopt=install_weak_deps=False install -y \
# Base toolchain we need to build anything (clang, cmake, make and the like)
clang \
cmake \
Expand Down