Skip to content

Commit 6b46a28

Browse files
[dotnet] - Support noble distro and remove stale powershell security patch (devcontainers#1158)
* [dotnet] - powershell fails in other variants * changes misc. * misc change * removed set -x , set +x * removed uid & gid config options from common-utils * mistake correction
1 parent ad358cf commit 6b46a28

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

src/dotnet/.devcontainer/Dockerfile

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,4 @@ ENV PATH $PATH:/home/vscode/.dotnet:/home/vscode/.dotnet/tools
44

55
# clear this environment variable so xml docs from NuGet packages are unpackaged. The default dotnet/sdk image sets it to 'skip'.
66
# see https://github.com/dotnet/dotnet-docker/issues/2790
7-
ENV NUGET_XMLDOC_MODE=
8-
9-
# Temporary: Upgrade packages due to mentioned CVEs
10-
# They are installed by the base image (mcr.microsoft.com/dotnet/sdk) which does not have the patch.
11-
# https://msrc.microsoft.com/update-guide/vulnerability/CVE-2024-30045
12-
RUN if [ "$(dpkg --print-architecture)" = "amd64" ]; then \
13-
apt-get update && \
14-
apt-get install -y wget && \
15-
POWERSHELL_FILE_NAME="powershell_7.4.4-1.deb_amd64.deb" && \
16-
wget https://github.com/PowerShell/PowerShell/releases/download/v7.4.4/${POWERSHELL_FILE_NAME} && \
17-
dpkg -i ${POWERSHELL_FILE_NAME} && \
18-
apt-get install -f && \
19-
rm ${POWERSHELL_FILE_NAME} ; \
20-
fi
21-
22-
RUN if [ "$(dpkg --print-architecture)" = "arm64" ]; then \
23-
apt-get update && \
24-
apt-get install -y curl tar && \
25-
POWERSHELL_FILE_PATH="/opt/microsoft/powershell/7" && \
26-
curl -L -o /tmp/powershell.tar.gz https://github.com/PowerShell/PowerShell/releases/download/v7.4.4/powershell-7.4.4-linux-arm64.tar.gz && \
27-
mkdir -p ${POWERSHELL_FILE_PATH} && \
28-
tar zxf /tmp/powershell.tar.gz -C ${POWERSHELL_FILE_PATH} && \
29-
chmod +x ${POWERSHELL_FILE_PATH}/pwsh && \
30-
ln -snf ${POWERSHELL_FILE_PATH}/pwsh /usr/bin/pwsh && \
31-
rm /tmp/powershell.tar.gz ; \
32-
fi
7+
ENV NUGET_XMLDOC_MODE=

src/dotnet/.devcontainer/devcontainer.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"ghcr.io/devcontainers/features/common-utils:2": {
88
"installZsh": "true",
99
"username": "vscode",
10-
"userUid": "1000",
11-
"userGid": "1000",
1210
"upgradePackages": "true"
1311
},
1412
"ghcr.io/devcontainers/features/node:1": {

0 commit comments

Comments
 (0)