From c378c6004f655e21574d3d33d328d39f6fd1bf08 Mon Sep 17 00:00:00 2001 From: Christoph Bergmeister Date: Sun, 7 Feb 2021 15:58:52 +0000 Subject: [PATCH 1/2] simplify devcontainer setup and resolve git line ending conflicts --- .devcontainer/Dockerfile | 29 ++--------------------------- .gitattributes | 1 + 2 files changed, 3 insertions(+), 27 deletions(-) create mode 100644 .gitattributes diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 571a36cf7..2ca5c91b6 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,31 +1,6 @@ -#------------------------------------------------------------------------------------------------------------- # Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. -#------------------------------------------------------------------------------------------------------------- +# Licensed under the MIT License. FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 - -# This Dockerfile adds a non-root user with sudo access. Use the "remoteUser" -# property in devcontainer.json to use it. On Linux, the container user's GID/UIDs -# will be updated to match your local UID/GID (when using the dockerFile property). -# See https://aka.ms/vscode-remote/containers/non-root-user for details. - -# Avoid warnings by switching to noninteractive -ENV DEBIAN_FRONTEND=noninteractive - -# Configure apt and install packages -RUN apt-get update \ - && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 \ - # - # Verify git, process tools, lsb-release (common in install instructions for CLIs) installed - && apt-get -y install git iproute2 procps apt-transport-https gnupg2 curl lsb-release \ - # - # Clean up - && apt-get autoremove -y \ - && apt-get clean -y \ - && rm -rf /var/lib/apt/lists/* -RUN pwsh -c Install-Module platyPS,Pester -Force - -# Switch back to dialog for any ad-hoc use of apt-get -ENV DEBIAN_FRONTEND=dialog +RUN pwsh --command Install-Module platyPS,Pester -Force \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..94f480de9 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf \ No newline at end of file From 294442129b6290d611a8c92e1e8d8dcf98421f73 Mon Sep 17 00:00:00 2001 From: Robert Holt Date: Wed, 21 Apr 2021 13:41:31 -0700 Subject: [PATCH 2/2] Apply suggestions from code review --- .devcontainer/Dockerfile | 2 +- .gitattributes | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 2ca5c91b6..c803e558a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,4 +3,4 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1.101 -RUN pwsh --command Install-Module platyPS,Pester -Force \ No newline at end of file +RUN pwsh --command Install-Module platyPS,Pester -Force diff --git a/.gitattributes b/.gitattributes index 94f480de9..6313b56c5 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1 @@ -* text=auto eol=lf \ No newline at end of file +* text=auto eol=lf