From ffb61903f1bd9df4bb1ecf6cdb5cf3a8408b817c Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Fri, 9 Aug 2019 07:05:31 -0700 Subject: [PATCH] Minor fixes --- .../docker-compose/.devcontainer/Dockerfile | 2 +- .../dockerfile/.devcontainer/Dockerfile | 2 +- .../azure-ansible/.devcontainer/Dockerfile | 2 +- .../azure-blockchain/.devcontainer/Dockerfile | 2 +- containers/azure-cli/.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../azure-terraform/.devcontainer/Dockerfile | 2 +- containers/bazel/.devcontainer/Dockerfile | 2 +- containers/cpp/.devcontainer/Dockerfile | 2 +- containers/dart/.devcontainer/Dockerfile | 2 +- .../debian-9-git/.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../docker-in-docker/.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../dotnetcore-2.1/.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- containers/elm/.devcontainer/Dockerfile | 2 +- containers/go/.devcontainer/Dockerfile | 6 ++-- containers/java-11/.devcontainer/Dockerfile | 2 +- containers/java-12/.devcontainer/Dockerfile | 15 +++++---- .../.devcontainer/Dockerfile | 32 ++++++++++--------- containers/java-8/.devcontainer/Dockerfile | 2 +- .../kubernetes-helm/.devcontainer/Dockerfile | 2 +- containers/markdown/.devcontainer/Dockerfile | 2 +- containers/perl/.devcontainer/Dockerfile | 2 +- containers/php-7/.devcontainer/Dockerfile | 2 +- containers/plantuml/.devcontainer/Dockerfile | 2 +- .../powershell/.devcontainer/Dockerfile | 2 +- containers/puppet/.devcontainer/Dockerfile | 2 +- containers/python-2/.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 2 +- containers/python-3/.devcontainer/Dockerfile | 2 +- containers/r/.devcontainer/Dockerfile | 2 +- .../ruby-2-rails-5/.devcontainer/Dockerfile | 2 +- .../ruby-2-sinatra/.devcontainer/Dockerfile | 2 +- containers/ruby-2/.devcontainer/Dockerfile | 2 +- containers/rust/.devcontainer/Dockerfile | 2 +- containers/swift-4/.devcontainer/Dockerfile | 2 +- .../ubuntu-18.04-git/.devcontainer/Dockerfile | 2 +- 46 files changed, 72 insertions(+), 67 deletions(-) diff --git a/container-templates/docker-compose/.devcontainer/Dockerfile b/container-templates/docker-compose/.devcontainer/Dockerfile index 037f089e4f..3ffec10e09 100644 --- a/container-templates/docker-compose/.devcontainer/Dockerfile +++ b/container-templates/docker-compose/.devcontainer/Dockerfile @@ -38,7 +38,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/container-templates/dockerfile/.devcontainer/Dockerfile b/container-templates/dockerfile/.devcontainer/Dockerfile index 179be5d7ef..8bd92538f3 100644 --- a/container-templates/dockerfile/.devcontainer/Dockerfile +++ b/container-templates/dockerfile/.devcontainer/Dockerfile @@ -33,7 +33,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-ansible/.devcontainer/Dockerfile b/containers/azure-ansible/.devcontainer/Dockerfile index eac1df1c1c..8a2586387f 100644 --- a/containers/azure-ansible/.devcontainer/Dockerfile +++ b/containers/azure-ansible/.devcontainer/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-blockchain/.devcontainer/Dockerfile b/containers/azure-blockchain/.devcontainer/Dockerfile index ec12da0ae1..ebfa4d3f99 100644 --- a/containers/azure-blockchain/.devcontainer/Dockerfile +++ b/containers/azure-blockchain/.devcontainer/Dockerfile @@ -45,7 +45,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-cli/.devcontainer/Dockerfile b/containers/azure-cli/.devcontainer/Dockerfile index 657a5ebf27..0665acace7 100644 --- a/containers/azure-cli/.devcontainer/Dockerfile +++ b/containers/azure-cli/.devcontainer/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile b/containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile index 5c76cbf43d..51f6ff3ecd 100644 --- a/containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile +++ b/containers/azure-functions-dotnetcore-2.1/.devcontainer/Dockerfile @@ -41,7 +41,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-functions-dotnetcore-latest/.devcontainer/Dockerfile b/containers/azure-functions-dotnetcore-latest/.devcontainer/Dockerfile index 13fb1874a8..3bd899da29 100644 --- a/containers/azure-functions-dotnetcore-latest/.devcontainer/Dockerfile +++ b/containers/azure-functions-dotnetcore-latest/.devcontainer/Dockerfile @@ -41,7 +41,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-functions-java-8/.devcontainer/Dockerfile b/containers/azure-functions-java-8/.devcontainer/Dockerfile index c71e963bf5..0b37c6acf6 100644 --- a/containers/azure-functions-java-8/.devcontainer/Dockerfile +++ b/containers/azure-functions-java-8/.devcontainer/Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-functions-python-3/.devcontainer/Dockerfile b/containers/azure-functions-python-3/.devcontainer/Dockerfile index 608a6a7e14..ffe1b311a5 100644 --- a/containers/azure-functions-python-3/.devcontainer/Dockerfile +++ b/containers/azure-functions-python-3/.devcontainer/Dockerfile @@ -52,7 +52,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile b/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile index cbadea3193..8de057c482 100644 --- a/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile +++ b/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile @@ -46,7 +46,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Install pylint and Azure ML SDK diff --git a/containers/azure-terraform/.devcontainer/Dockerfile b/containers/azure-terraform/.devcontainer/Dockerfile index 072ebdd8e3..3eaf04e135 100644 --- a/containers/azure-terraform/.devcontainer/Dockerfile +++ b/containers/azure-terraform/.devcontainer/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/bazel/.devcontainer/Dockerfile b/containers/bazel/.devcontainer/Dockerfile index 0bc3e32ab0..28d089d4e0 100644 --- a/containers/bazel/.devcontainer/Dockerfile +++ b/containers/bazel/.devcontainer/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/cpp/.devcontainer/Dockerfile b/containers/cpp/.devcontainer/Dockerfile index dab269512f..ed45944cb7 100644 --- a/containers/cpp/.devcontainer/Dockerfile +++ b/containers/cpp/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/dart/.devcontainer/Dockerfile b/containers/dart/.devcontainer/Dockerfile index ba09fe3099..50453fb7ee 100644 --- a/containers/dart/.devcontainer/Dockerfile +++ b/containers/dart/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/debian-9-git/.devcontainer/Dockerfile b/containers/debian-9-git/.devcontainer/Dockerfile index dadf7227e9..acefd1b80a 100644 --- a/containers/debian-9-git/.devcontainer/Dockerfile +++ b/containers/debian-9-git/.devcontainer/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/docker-in-docker-compose/.devcontainer/Dockerfile b/containers/docker-in-docker-compose/.devcontainer/Dockerfile index 8163c7c819..9a6e649fc9 100644 --- a/containers/docker-in-docker-compose/.devcontainer/Dockerfile +++ b/containers/docker-in-docker-compose/.devcontainer/Dockerfile @@ -43,7 +43,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/docker-in-docker/.devcontainer/Dockerfile b/containers/docker-in-docker/.devcontainer/Dockerfile index be8517d722..d87db49f42 100644 --- a/containers/docker-in-docker/.devcontainer/Dockerfile +++ b/containers/docker-in-docker/.devcontainer/Dockerfile @@ -44,7 +44,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/dotnetcore-2.1-fsharp/.devcontainer/Dockerfile b/containers/dotnetcore-2.1-fsharp/.devcontainer/Dockerfile index b4f804842f..499308e4f8 100644 --- a/containers/dotnetcore-2.1-fsharp/.devcontainer/Dockerfile +++ b/containers/dotnetcore-2.1-fsharp/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/dotnetcore-2.1/.devcontainer/Dockerfile b/containers/dotnetcore-2.1/.devcontainer/Dockerfile index 07e4f1e3d0..1c129b4966 100644 --- a/containers/dotnetcore-2.1/.devcontainer/Dockerfile +++ b/containers/dotnetcore-2.1/.devcontainer/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/dotnetcore-latest-fsharp/.devcontainer/Dockerfile b/containers/dotnetcore-latest-fsharp/.devcontainer/Dockerfile index bd7d7e26f7..a7ae3c0ee9 100644 --- a/containers/dotnetcore-latest-fsharp/.devcontainer/Dockerfile +++ b/containers/dotnetcore-latest-fsharp/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/dotnetcore-latest/.devcontainer/Dockerfile b/containers/dotnetcore-latest/.devcontainer/Dockerfile index 5af44f1889..0c2c9f0b1e 100644 --- a/containers/dotnetcore-latest/.devcontainer/Dockerfile +++ b/containers/dotnetcore-latest/.devcontainer/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/elm/.devcontainer/Dockerfile b/containers/elm/.devcontainer/Dockerfile index c66d8d4eb4..6c6034eb19 100644 --- a/containers/elm/.devcontainer/Dockerfile +++ b/containers/elm/.devcontainer/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/go/.devcontainer/Dockerfile b/containers/go/.devcontainer/Dockerfile index c7b4e09bee..f0471e58a7 100644 --- a/containers/go/.devcontainer/Dockerfile +++ b/containers/go/.devcontainer/Dockerfile @@ -58,9 +58,9 @@ RUN apt-get update \ && groupadd --gid $USER_GID $USERNAME \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support - # && apt-get install -y sudo \ - # && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ - # && chmod 0440 /etc/sudoers.d/$USERNAME \ + && apt-get install -y sudo \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ + && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up && apt-get autoremove -y \ diff --git a/containers/java-11/.devcontainer/Dockerfile b/containers/java-11/.devcontainer/Dockerfile index 59d6ad9fd6..bdfc475f0d 100644 --- a/containers/java-11/.devcontainer/Dockerfile +++ b/containers/java-11/.devcontainer/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Verify git, needed tools installed diff --git a/containers/java-12/.devcontainer/Dockerfile b/containers/java-12/.devcontainer/Dockerfile index 4f4a21da58..de99dabe58 100644 --- a/containers/java-12/.devcontainer/Dockerfile +++ b/containers/java-12/.devcontainer/Dockerfile @@ -5,17 +5,20 @@ FROM openjdk:12-jdk -# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user. -# On Linux, update the USER_UID, USER_GID argumetns if not the default 1000 +# This Dockerfile adds a non-root 'vscode' user with sudo access. However, for Linux, +# this user's GID/UID must match your local user UID/GID to avoid permission issues +# with bind mounts. Update USER_UID / USER_GID if yours is not 1000. See +# https://aka.ms/vscode-remote/containers/non-root-user for details. ARG USERNAME=vscode ARG USER_UID=1000 ARG USER_GID=$USER_UID + RUN groupadd --gid $USER_GID $USERNAME \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME -# [Optional] Uncomment the next three lines to add sudo support for the non-root user -# RUN yum install -y sudo \ -# && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ -# && chmod 0440 /etc/sudoers.d/$USERNAME + # [Optional] Add sudo support for the non-root user + && yum install -y sudo \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ + && chmod 0440 /etc/sudoers.d/$USERNAME # Verify git, needed tools installed RUN yum install -y git curl procps unzip diff --git a/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile b/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile index e2db8bd668..f53be0a90e 100644 --- a/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile +++ b/containers/java-8-tomcat-8.5/.devcontainer/Dockerfile @@ -12,24 +12,29 @@ FROM tomcat:8.5-jre8 ARG USERNAME=vscode ARG USER_UID=1000 ARG USER_GID=$USER_UID -# Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user. -RUN groupadd --gid $USER_GID $USERNAME \ - && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME - # [Optional] Uncomment the next three lines to add sudo support - # && apt-get install -y sudo \ - # && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ - # && chmod 0440 /etc/sudoers.d/$USERNAME # Configure apt ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update \ && apt-get -y install --no-install-recommends apt-utils dialog 2>&1 + # + # Create a non-root user to use if preferred - see https://aka.ms/vscode-remote/containers/non-root-user. + && groupadd --gid $USER_GID $USERNAME \ + && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ + # [Optional] Add sudo support for non-root user + && apt-get install -y sudo \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME \ + && chmod 0440 /etc/sudoers.d/$USERNAME + # + # Verify git, needed tools installed + && apt-get -y install git procps curl lsb-release \ + # + # Install openjdk 8 + && apt-get -y install --no-install-recommends openjdk-8-jdk \ + # + # Allow for a consistant java home location for settings - image is changing over time + && if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi -# Verify git, needed tools installed -RUN apt-get -y install git procps curl lsb-release - -# Install openjdk 8 -RUN apt-get -y install --no-install-recommends openjdk-8-jdk # Update JAVA_HOME ENV JAVA_HOME /docker-java-home @@ -52,6 +57,3 @@ RUN apt-get autoremove -y \ && apt-get clean -y \ && rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND= - -# Allow for a consistant java home location for settings - image is changing over time -RUN if [ ! -d "/docker-java-home" ]; then ln -s "${JAVA_HOME}" /docker-java-home; fi \ No newline at end of file diff --git a/containers/java-8/.devcontainer/Dockerfile b/containers/java-8/.devcontainer/Dockerfile index da6cb66188..070ff884bc 100644 --- a/containers/java-8/.devcontainer/Dockerfile +++ b/containers/java-8/.devcontainer/Dockerfile @@ -23,7 +23,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Verify git, needed tools installed diff --git a/containers/kubernetes-helm/.devcontainer/Dockerfile b/containers/kubernetes-helm/.devcontainer/Dockerfile index e2aa17fd3b..dbce44de93 100644 --- a/containers/kubernetes-helm/.devcontainer/Dockerfile +++ b/containers/kubernetes-helm/.devcontainer/Dockerfile @@ -63,7 +63,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/markdown/.devcontainer/Dockerfile b/containers/markdown/.devcontainer/Dockerfile index 4050356f58..af41ac5a56 100644 --- a/containers/markdown/.devcontainer/Dockerfile +++ b/containers/markdown/.devcontainer/Dockerfile @@ -30,7 +30,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/perl/.devcontainer/Dockerfile b/containers/perl/.devcontainer/Dockerfile index 46d1a15cba..e4fd706930 100644 --- a/containers/perl/.devcontainer/Dockerfile +++ b/containers/perl/.devcontainer/Dockerfile @@ -28,7 +28,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/php-7/.devcontainer/Dockerfile b/containers/php-7/.devcontainer/Dockerfile index 5a1e406c30..161f91eb8b 100644 --- a/containers/php-7/.devcontainer/Dockerfile +++ b/containers/php-7/.devcontainer/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/plantuml/.devcontainer/Dockerfile b/containers/plantuml/.devcontainer/Dockerfile index 43cdafcbd9..d12730a084 100644 --- a/containers/plantuml/.devcontainer/Dockerfile +++ b/containers/plantuml/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/powershell/.devcontainer/Dockerfile b/containers/powershell/.devcontainer/Dockerfile index 9efb5c9245..ffd8f30f4a 100644 --- a/containers/powershell/.devcontainer/Dockerfile +++ b/containers/powershell/.devcontainer/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update && apt-get -y install git procps \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/puppet/.devcontainer/Dockerfile b/containers/puppet/.devcontainer/Dockerfile index c6cfb290c3..c09d2b358b 100644 --- a/containers/puppet/.devcontainer/Dockerfile +++ b/containers/puppet/.devcontainer/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/python-2/.devcontainer/Dockerfile b/containers/python-2/.devcontainer/Dockerfile index a380fa3103..30baf21214 100644 --- a/containers/python-2/.devcontainer/Dockerfile +++ b/containers/python-2/.devcontainer/Dockerfile @@ -39,7 +39,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/python-3-anaconda/.devcontainer/Dockerfile b/containers/python-3-anaconda/.devcontainer/Dockerfile index 9e57fd261f..672012d2d2 100644 --- a/containers/python-3-anaconda/.devcontainer/Dockerfile +++ b/containers/python-3-anaconda/.devcontainer/Dockerfile @@ -39,7 +39,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/python-3-miniconda/.devcontainer/Dockerfile b/containers/python-3-miniconda/.devcontainer/Dockerfile index 9f8554ae31..be998d924d 100644 --- a/containers/python-3-miniconda/.devcontainer/Dockerfile +++ b/containers/python-3-miniconda/.devcontainer/Dockerfile @@ -39,7 +39,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/python-3-postgres/.devcontainer/Dockerfile b/containers/python-3-postgres/.devcontainer/Dockerfile index 4882625d4f..3dc7405082 100644 --- a/containers/python-3-postgres/.devcontainer/Dockerfile +++ b/containers/python-3-postgres/.devcontainer/Dockerfile @@ -41,7 +41,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/python-3/.devcontainer/Dockerfile b/containers/python-3/.devcontainer/Dockerfile index 95944c006c..f706065c2b 100644 --- a/containers/python-3/.devcontainer/Dockerfile +++ b/containers/python-3/.devcontainer/Dockerfile @@ -40,7 +40,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/r/.devcontainer/Dockerfile b/containers/r/.devcontainer/Dockerfile index c091d41abd..82a7283214 100644 --- a/containers/r/.devcontainer/Dockerfile +++ b/containers/r/.devcontainer/Dockerfile @@ -38,7 +38,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/ruby-2-rails-5/.devcontainer/Dockerfile b/containers/ruby-2-rails-5/.devcontainer/Dockerfile index 58c24d4a4f..34ddb0def6 100644 --- a/containers/ruby-2-rails-5/.devcontainer/Dockerfile +++ b/containers/ruby-2-rails-5/.devcontainer/Dockerfile @@ -50,7 +50,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/ruby-2-sinatra/.devcontainer/Dockerfile b/containers/ruby-2-sinatra/.devcontainer/Dockerfile index 7e4f3c6a46..7ee32be547 100644 --- a/containers/ruby-2-sinatra/.devcontainer/Dockerfile +++ b/containers/ruby-2-sinatra/.devcontainer/Dockerfile @@ -48,7 +48,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/ruby-2/.devcontainer/Dockerfile b/containers/ruby-2/.devcontainer/Dockerfile index 414af5aeee..01cf31d61e 100644 --- a/containers/ruby-2/.devcontainer/Dockerfile +++ b/containers/ruby-2/.devcontainer/Dockerfile @@ -31,7 +31,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/rust/.devcontainer/Dockerfile b/containers/rust/.devcontainer/Dockerfile index 02f1b8c1fc..72f10f263f 100644 --- a/containers/rust/.devcontainer/Dockerfile +++ b/containers/rust/.devcontainer/Dockerfile @@ -35,7 +35,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/swift-4/.devcontainer/Dockerfile b/containers/swift-4/.devcontainer/Dockerfile index 02cbacffa6..b13c6917cc 100644 --- a/containers/swift-4/.devcontainer/Dockerfile +++ b/containers/swift-4/.devcontainer/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up diff --git a/containers/ubuntu-18.04-git/.devcontainer/Dockerfile b/containers/ubuntu-18.04-git/.devcontainer/Dockerfile index 393aadb2fd..b569000f29 100644 --- a/containers/ubuntu-18.04-git/.devcontainer/Dockerfile +++ b/containers/ubuntu-18.04-git/.devcontainer/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update \ && useradd -s /bin/bash --uid $USER_UID --gid $USER_GID -m $USERNAME \ # [Optional] Add sudo support for the non-root user && apt-get install -y sudo \ - && echo vscode ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/vscode \ + && echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME\ && chmod 0440 /etc/sudoers.d/$USERNAME \ # # Clean up