Skip to content

Commit ec1c58d

Browse files
authored
Simplify devcontainer setup and resolve git line ending conflicts (#1637)
1 parent 1ff493e commit ec1c58d

File tree

2 files changed

+3
-27
lines changed

2 files changed

+3
-27
lines changed

.devcontainer/Dockerfile

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,6 @@
1-
#-------------------------------------------------------------------------------------------------------------
21
# Copyright (c) Microsoft Corporation. All rights reserved.
3-
# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
4-
#-------------------------------------------------------------------------------------------------------------
2+
# Licensed under the MIT License.
53

64
FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101
7-
8-
# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser"
9-
# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs
10-
# will be updated to match your local UID/GID (when using the dockerFile property).
11-
# See https://aka.ms/vscode-remote/containers/non-root-user for details.
12-
13-
# Avoid warnings by switching to noninteractive
14-
ENV DEBIAN_FRONTEND=noninteractive
15-
16-
# Configure apt and install packages
17-
RUN apt-get update \
18-
&& apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \
19-
#
20-
# Verify git, process tools, lsb-release (common in install instructions for CLIs) installed
21-
&& apt-get -y install git iproute2 procps apt-transport-https gnupg2 curl lsb-release \
22-
#
23-
# Clean up
24-
&& apt-get autoremove -y \
25-
&& apt-get clean -y \
26-
&& rm -rf /var/lib/apt/lists/*
275

28-
RUN pwsh -c Install-Module platyPS,Pester -Force
29-
30-
# Switch back to dialog for any ad-hoc use of apt-get
31-
ENV DEBIAN_FRONTEND=dialog
6+
RUN pwsh --command Install-Module platyPS,Pester -Force

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto eol=lf

0 commit comments

Comments
 (0)