Skip to content

Commit

Permalink
update runc and upgrade .Net versions on Ubuntu and AL(x86_64) images (
Browse files Browse the repository at this point in the history
…#703)

Co-authored-by: zhouyli <[email protected]>
  • Loading branch information
LZY7977 and zhouyli authored Feb 8, 2024
1 parent 211ddf6 commit 9dacbd5
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 6 deletions.
7 changes: 6 additions & 1 deletion al2/x86_64/standard/4.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ RUN set -ex \
&& ln -s /opt/microsoft/powershell/$POWERSHELL_VERSION/pwsh /usr/bin/pwsh

#DotNet 6.0
ENV DOTNET_60_SDK_VERSION="6.0.410"
ENV DOTNET_60_SDK_VERSION="6.0.418"
ENV DOTNET_ROOT="/root/.dotnet"

# Add .NET Core 6.0 Global Tools install folder to PATH
Expand Down Expand Up @@ -338,6 +338,11 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& yum -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& groupadd dockremap \
&& useradd -g dockremap dockremap \
Expand Down
9 changes: 7 additions & 2 deletions al2/x86_64/standard/5.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,8 @@ RUN curl https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o /tmp/awscli
&& aws --version

#DotNet 6.0
ENV DOTNET_6_SDK_VERSION="6.0.417"
ENV DOTNET_8_SDK_VERSION="8.0.100"
ENV DOTNET_6_SDK_VERSION="6.0.418"
ENV DOTNET_8_SDK_VERSION="8.0.101"
ENV DOTNET_6_GLOBAL_JSON_SDK_VERSION="6.0.0"
ENV DOTNET_8_GLOBAL_JSON_SDK_VERSION="8.0.0"
ENV DOTNET_ROOT="/root/.dotnet"
Expand Down Expand Up @@ -377,6 +377,11 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& yum -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& groupadd dockremap \
&& useradd -g dockremap dockremap \
Expand Down
6 changes: 6 additions & 0 deletions al2/x86_64/standard/corretto11/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& amazon-linux-extras enable docker \
&& yum -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& groupadd dockremap \
&& useradd -g dockremap dockremap \
Expand Down
6 changes: 6 additions & 0 deletions al2/x86_64/standard/corretto8/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,12 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& amazon-linux-extras enable docker \
&& yum -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& groupadd dockremap \
&& useradd -g dockremap dockremap \
Expand Down
5 changes: 5 additions & 0 deletions ubuntu/standard/5.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,11 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& apt-get update && apt-get -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& addgroup dockremap \
&& useradd -g dockremap dockremap \
Expand Down
7 changes: 6 additions & 1 deletion ubuntu/standard/6.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ FROM tools AS runtimes

#**************** .NET-CORE *******************************************************

ENV DOTNET_6_SDK_VERSION="6.0.410"
ENV DOTNET_6_SDK_VERSION="6.0.418"
ENV DOTNET_ROOT="/root/.dotnet"

# Add .NET Core 6 Global Tools install folder to PATH
Expand Down Expand Up @@ -353,6 +353,11 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& apt-get update && apt-get -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& addgroup dockremap \
&& useradd -g dockremap dockremap \
Expand Down
9 changes: 7 additions & 2 deletions ubuntu/standard/7.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ FROM tools AS runtimes

#**************** .NET-CORE *******************************************************

ENV DOTNET_6_SDK_VERSION="6.0.417"
ENV DOTNET_8_SDK_VERSION="8.0.100"
ENV DOTNET_6_SDK_VERSION="6.0.418"
ENV DOTNET_8_SDK_VERSION="8.0.101"
ENV DOTNET_6_GLOBAL_JSON_SDK_VERSION="6.0.0"
ENV DOTNET_8_GLOBAL_JSON_SDK_VERSION="8.0.0"
ENV DOTNET_ROOT="/root/.dotnet"
Expand Down Expand Up @@ -397,6 +397,11 @@ RUN set -ex \
&& tar --extract --file docker.tgz --strip-components 1 --directory /usr/local/bin/ \
&& rm docker.tgz \
&& docker -v \
# replace runc package to resolve CVE-2024-21626
&& apt-get update && apt-get -y install runc \
&& rm -f /usr/local/bin/runc \
&& ln -s /usr/sbin/runc /usr/local/bin/runc \
&& runc -v \
# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
&& addgroup dockremap \
&& useradd -g dockremap dockremap \
Expand Down

0 comments on commit 9dacbd5

Please sign in to comment.