From faf62ddef98c8aca70c8432e982126b3c5c362a8 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Thu, 11 Apr 2019 19:18:55 -0700 Subject: [PATCH] Added procps to definitions --- .../docker-compose/.devcontainer/Dockerfile | 5 ++--- .../dockerfile/.devcontainer/Dockerfile | 5 ++--- containers/azure-cli/.devcontainer/Dockerfile | 4 ++-- .../azure-functions-node-8/.devcontainer/Dockerfile | 4 ++-- .../.devcontainer/Dockerfile | 5 ++--- .../.devcontainer/Dockerfile | 5 ++--- containers/azure-terraform/.devcontainer/Dockerfile | 4 ++-- containers/cpp/.devcontainer/Dockerfile | 4 ++-- containers/dart-web/.devcontainer/Dockerfile | 4 ++-- .../.devcontainer/Dockerfile | 5 ++--- containers/docker-in-docker/.devcontainer/Dockerfile | 5 ++--- .../dotnetcore-2.2-fsharp/.devcontainer/Dockerfile | 4 ++-- containers/dotnetcore-2.2/.devcontainer/Dockerfile | 4 ++-- containers/go/.devcontainer/Dockerfile | 4 ++-- containers/java-8-maven/.devcontainer/Dockerfile | 4 ++-- .../javascript-node-8/.devcontainer/Dockerfile | 10 ++++++---- .../.devcontainer/devcontainer.json | 2 +- .../.devcontainer/Dockerfile | 12 +++++++----- .../javascript-node-lts/.devcontainer/Dockerfile | 10 ++++++---- containers/kubernetes-helm/.devcontainer/Dockerfile | 6 +++--- containers/markdown/.devcontainer/Dockerfile | 5 ++--- containers/php-7/.devcontainer/Dockerfile | 4 ++-- containers/plantuml/.devcontainer/Dockerfile | 5 ++--- containers/powershell/.devcontainer/Dockerfile | 5 ++--- containers/python-2/.devcontainer/Dockerfile | 4 ++-- containers/python-3-django/.devcontainer/Dockerfile | 6 +++--- .../python-3-flask-redis/.devcontainer/Dockerfile | 2 +- .../.devcontainer/Dockerfile | 7 +++++-- containers/python-3/.devcontainer/Dockerfile | 6 +++--- containers/ruby-2/.devcontainer/Dockerfile | 4 ++-- containers/rust/.devcontainer/Dockerfile | 4 ++-- containers/swift-4/.devcontainer/Dockerfile | 4 ++-- .../typescript-node-8/.devcontainer/Dockerfile | 12 +++++++----- .../typescript-node-lts/.devcontainer/Dockerfile | 12 +++++++----- containers/ubuntu-18.04-git/.devcontainer/Dockerfile | 5 ++--- 35 files changed, 97 insertions(+), 94 deletions(-) diff --git a/container-templates/docker-compose/.devcontainer/Dockerfile b/container-templates/docker-compose/.devcontainer/Dockerfile index c3f7b6490b..1857ebf22a 100644 --- a/container-templates/docker-compose/.devcontainer/Dockerfile +++ b/container-templates/docker-compose/.devcontainer/Dockerfile @@ -11,9 +11,8 @@ # Debian and Ubuntu based images are supported. Alpine images are not yet supported. FROM ubuntu:bionic -# Install common tools developers typically will need like git -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # ***************************************************** # * Add steps for installing needed dependencies here * diff --git a/container-templates/dockerfile/.devcontainer/Dockerfile b/container-templates/dockerfile/.devcontainer/Dockerfile index 3c909c966f..459734f1d9 100644 --- a/container-templates/dockerfile/.devcontainer/Dockerfile +++ b/container-templates/dockerfile/.devcontainer/Dockerfile @@ -6,9 +6,8 @@ # Debian and Ubuntu based images are supported. Alpine images are not yet supported. FROM ubuntu:bionic -# Install common tools developers typically will need -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # ***************************************************** # * Add steps for installing needed dependencies here * diff --git a/containers/azure-cli/.devcontainer/Dockerfile b/containers/azure-cli/.devcontainer/Dockerfile index 49169583ef..bb3dc58a3f 100644 --- a/containers/azure-cli/.devcontainer/Dockerfile +++ b/containers/azure-cli/.devcontainer/Dockerfile @@ -5,8 +5,8 @@ FROM debian:9 -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install the Azure CLI RUN apt-get install -y apt-transport-https curl gnupg2 lsb-release \ diff --git a/containers/azure-functions-node-8/.devcontainer/Dockerfile b/containers/azure-functions-node-8/.devcontainer/Dockerfile index b40d59faa1..f52e03e48a 100644 --- a/containers/azure-functions-node-8/.devcontainer/Dockerfile +++ b/containers/azure-functions-node-8/.devcontainer/Dockerfile @@ -5,8 +5,8 @@ FROM microsoft/dotnet:2.1-sdk-stretch -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install Node.js RUN apt-get install -y curl \ diff --git a/containers/azure-hdinsight-python-3/.devcontainer/Dockerfile b/containers/azure-hdinsight-python-3/.devcontainer/Dockerfile index fa42d17dba..7219b9cca1 100644 --- a/containers/azure-hdinsight-python-3/.devcontainer/Dockerfile +++ b/containers/azure-hdinsight-python-3/.devcontainer/Dockerfile @@ -6,9 +6,8 @@ # HDInsight extension needs mono FROM mono:5 -# Install git tools -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install python 3 RUN apt-get install -y python3 python3-pip diff --git a/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile b/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile index 356d8ffff1..906f1cdd9f 100644 --- a/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile +++ b/containers/azure-machine-learning-python-3/.devcontainer/Dockerfile @@ -5,9 +5,8 @@ FROM python:3.7-slim -# Install required tools -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install Docker CE - ** COMMENT OUT IF YOU WILL ONLY RUN LOCAL OR IN AZURE ** RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common \ diff --git a/containers/azure-terraform/.devcontainer/Dockerfile b/containers/azure-terraform/.devcontainer/Dockerfile index 4dc77519c3..f8549f91f8 100644 --- a/containers/azure-terraform/.devcontainer/Dockerfile +++ b/containers/azure-terraform/.devcontainer/Dockerfile @@ -6,9 +6,9 @@ # Pick any base image, but if you select node, skip installing node. 😊 FROM ubuntu:bionic -# Install required tools +# Install git, required tools RUN apt-get update \ - && apt-get install -y git curl gnupg unzip + && apt-get install -y git curl gnupg unzip procps # [Optional] Install Node.js for Azure Cloud Shell support RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \ diff --git a/containers/cpp/.devcontainer/Dockerfile b/containers/cpp/.devcontainer/Dockerfile index 4a3344b390..aaeaee1dea 100644 --- a/containers/cpp/.devcontainer/Dockerfile +++ b/containers/cpp/.devcontainer/Dockerfile @@ -5,8 +5,8 @@ FROM ubuntu:bionic -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install C++ tools RUN apt-get -y install build-essential cmake cppcheck valgrind diff --git a/containers/dart-web/.devcontainer/Dockerfile b/containers/dart-web/.devcontainer/Dockerfile index 5b48f49c25..758254c413 100644 --- a/containers/dart-web/.devcontainer/Dockerfile +++ b/containers/dart-web/.devcontainer/Dockerfile @@ -9,8 +9,8 @@ ENV PATH="$PATH":"/root/.pub-cache/bin" RUN pub global activate webdev -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/docker-in-docker-compose/.devcontainer/Dockerfile b/containers/docker-in-docker-compose/.devcontainer/Dockerfile index 6c2822feaa..84c281df5a 100644 --- a/containers/docker-in-docker-compose/.devcontainer/Dockerfile +++ b/containers/docker-in-docker-compose/.devcontainer/Dockerfile @@ -6,9 +6,8 @@ # Note: You can use any Debian/Ubuntu based image you want. FROM ubuntu:bionic -# Install git -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install Docker CE CLI. If you choose a Debian based image, update https://download.docker.com/linux/ubuntu # to https://download.docker.com/linux/debian on the third line below. diff --git a/containers/docker-in-docker/.devcontainer/Dockerfile b/containers/docker-in-docker/.devcontainer/Dockerfile index 6694c2cda9..c516278432 100644 --- a/containers/docker-in-docker/.devcontainer/Dockerfile +++ b/containers/docker-in-docker/.devcontainer/Dockerfile @@ -7,9 +7,8 @@ # Note: You can use any Debian/Ubuntu based image you want. FROM ubuntu:bionic -# Install git -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install Docker CE CLI. If you choose a Debian based image, update https://download.docker.com/linux/ubuntu # to https://download.docker.com/linux/debian on the third line below. diff --git a/containers/dotnetcore-2.2-fsharp/.devcontainer/Dockerfile b/containers/dotnetcore-2.2-fsharp/.devcontainer/Dockerfile index c8eee24d18..94aabbd665 100644 --- a/containers/dotnetcore-2.2-fsharp/.devcontainer/Dockerfile +++ b/containers/dotnetcore-2.2-fsharp/.devcontainer/Dockerfile @@ -9,8 +9,8 @@ FROM microsoft/dotnet:2.2-sdk # .NET Core should be used as the runtime. COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install fsharp RUN apt-get install -y fsharp diff --git a/containers/dotnetcore-2.2/.devcontainer/Dockerfile b/containers/dotnetcore-2.2/.devcontainer/Dockerfile index d3b25dc7b7..e4c56cc979 100644 --- a/containers/dotnetcore-2.2/.devcontainer/Dockerfile +++ b/containers/dotnetcore-2.2/.devcontainer/Dockerfile @@ -5,8 +5,8 @@ FROM microsoft/dotnet:2.2-sdk -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/go/.devcontainer/Dockerfile b/containers/go/.devcontainer/Dockerfile index ee1335953d..8e93a6a957 100644 --- a/containers/go/.devcontainer/Dockerfile +++ b/containers/go/.devcontainer/Dockerfile @@ -23,8 +23,8 @@ RUN go get -u -v \ github.com/mgechev/revive \ github.com/derekparker/delve/cmd/dlv -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/java-8-maven/.devcontainer/Dockerfile b/containers/java-8-maven/.devcontainer/Dockerfile index 1e78099eb4..47a889bc0c 100644 --- a/containers/java-8-maven/.devcontainer/Dockerfile +++ b/containers/java-8-maven/.devcontainer/Dockerfile @@ -5,8 +5,8 @@ FROM maven:3.6-jdk-8-slim -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/javascript-node-8/.devcontainer/Dockerfile b/containers/javascript-node-8/.devcontainer/Dockerfile index f0ed02abfd..a615abd4e7 100644 --- a/containers/javascript-node-8/.devcontainer/Dockerfile +++ b/containers/javascript-node-8/.devcontainer/Dockerfile @@ -5,13 +5,15 @@ FROM node:8-slim -# Install yarn and git -RUN apt-get update \ - && apt-get install -y apt-transport-https \ +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + +# Install yarn +RUN apt-get install -y curl apt-transport-https \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ - && apt-get install -y yarn git + && apt-get install -y yarn # Install eslint RUN npm install -g eslint diff --git a/containers/javascript-node-8/.devcontainer/devcontainer.json b/containers/javascript-node-8/.devcontainer/devcontainer.json index fd6f10d767..488555447a 100644 --- a/containers/javascript-node-8/.devcontainer/devcontainer.json +++ b/containers/javascript-node-8/.devcontainer/devcontainer.json @@ -1,5 +1,5 @@ { - "name": "Node.js 8 & Yarn", + "name": "Node.js 8", "dockerFile": ".devcontainer/Dockerfile", "appPort": 3000, "extensions": [ diff --git a/containers/javascript-node-lts-mongo/.devcontainer/Dockerfile b/containers/javascript-node-lts-mongo/.devcontainer/Dockerfile index d3c8d3fb7f..868d8f8e24 100644 --- a/containers/javascript-node-lts-mongo/.devcontainer/Dockerfile +++ b/containers/javascript-node-lts-mongo/.devcontainer/Dockerfile @@ -5,14 +5,16 @@ FROM node:lts-slim -# Install yarn and git -RUN apt-get update \ - && apt-get install -y apt-transport-https \ +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + +# Install yarn +RUN apt-get install -y curl apt-transport-https \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ - && apt-get install -y yarn git - + && apt-get install -y yarn + # Install eslint RUN npm install -g eslint diff --git a/containers/javascript-node-lts/.devcontainer/Dockerfile b/containers/javascript-node-lts/.devcontainer/Dockerfile index f0ed02abfd..a615abd4e7 100644 --- a/containers/javascript-node-lts/.devcontainer/Dockerfile +++ b/containers/javascript-node-lts/.devcontainer/Dockerfile @@ -5,13 +5,15 @@ FROM node:8-slim -# Install yarn and git -RUN apt-get update \ - && apt-get install -y apt-transport-https \ +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + +# Install yarn +RUN apt-get install -y curl apt-transport-https \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ - && apt-get install -y yarn git + && apt-get install -y yarn # Install eslint RUN npm install -g eslint diff --git a/containers/kubernetes-helm/.devcontainer/Dockerfile b/containers/kubernetes-helm/.devcontainer/Dockerfile index a674852108..85e0052c13 100644 --- a/containers/kubernetes-helm/.devcontainer/Dockerfile +++ b/containers/kubernetes-helm/.devcontainer/Dockerfile @@ -5,9 +5,9 @@ FROM ubuntu:bionic -# Install required tools -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + # Install Docker CE CLI. If you choose a Debian based image, update https://download.docker.com/linux/ubuntu # to https://download.docker.com/linux/debian on the third line below. diff --git a/containers/markdown/.devcontainer/Dockerfile b/containers/markdown/.devcontainer/Dockerfile index e8c86da25f..c980ff48bb 100644 --- a/containers/markdown/.devcontainer/Dockerfile +++ b/containers/markdown/.devcontainer/Dockerfile @@ -5,9 +5,8 @@ FROM ubuntu:bionic -# Install git -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/php-7/.devcontainer/Dockerfile b/containers/php-7/.devcontainer/Dockerfile index 3a4eb27564..72b938fd4d 100644 --- a/containers/php-7/.devcontainer/Dockerfile +++ b/containers/php-7/.devcontainer/Dockerfile @@ -11,8 +11,8 @@ RUN yes | pecl install xdebug \ && echo "xdebug.remote_enable=on" >> /usr/local/etc/php/conf.d/xdebug.ini \ && echo "xdebug.remote_autostart=on" >> /usr/local/etc/php/conf.d/xdebug.ini -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/plantuml/.devcontainer/Dockerfile b/containers/plantuml/.devcontainer/Dockerfile index 2aaf8d5161..654e32ac94 100644 --- a/containers/plantuml/.devcontainer/Dockerfile +++ b/containers/plantuml/.devcontainer/Dockerfile @@ -5,9 +5,8 @@ FROM java:11 -# Install required tools -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install GraphViz RUN apt-get install -y graphviz diff --git a/containers/powershell/.devcontainer/Dockerfile b/containers/powershell/.devcontainer/Dockerfile index d19ba66519..b74a6281e2 100644 --- a/containers/powershell/.devcontainer/Dockerfile +++ b/containers/powershell/.devcontainer/Dockerfile @@ -5,9 +5,8 @@ FROM microsoft/powershell -# Install required tools -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/python-2/.devcontainer/Dockerfile b/containers/python-2/.devcontainer/Dockerfile index d1a47b8118..bc1e86e831 100644 --- a/containers/python-2/.devcontainer/Dockerfile +++ b/containers/python-2/.devcontainer/Dockerfile @@ -10,8 +10,8 @@ COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json RUN pip install pylint -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install any missing dependencies for enhanced language service RUN apt-get install -y libicu57 diff --git a/containers/python-3-django/.devcontainer/Dockerfile b/containers/python-3-django/.devcontainer/Dockerfile index c742c77c9f..25a3f812b0 100644 --- a/containers/python-3-django/.devcontainer/Dockerfile +++ b/containers/python-3-django/.devcontainer/Dockerfile @@ -17,11 +17,11 @@ WORKDIR /workspace COPY requirements.txt /workspace/ RUN pip install -r requirements.txt && rm -f requirements.txt -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install any missing dependencies for enhanced language service -RUN apt-get install -y libicu57 +RUN apt-get install -y libicu[0-9][0-9] # Clean up RUN apt-get autoremove -y \ diff --git a/containers/python-3-flask-redis/.devcontainer/Dockerfile b/containers/python-3-flask-redis/.devcontainer/Dockerfile index 1cec1b941d..46bcbd0215 100644 --- a/containers/python-3-flask-redis/.devcontainer/Dockerfile +++ b/containers/python-3-flask-redis/.devcontainer/Dockerfile @@ -19,7 +19,7 @@ RUN pip install -r requirements.txt && rm -f requirements.txt RUN apt-get update && apt-get -y install git # Install any missing dependencies for enhanced language service -RUN apt-get install -y libicu57 +RUN apt-get install -y libicu[0-9][0-9] # Clean up RUN apt-get autoremove -y \ diff --git a/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile b/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile index 8a23f44a28..5e1f132c86 100644 --- a/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile +++ b/containers/python-3-jupyter-pyspark/.devcontainer/Dockerfile @@ -7,8 +7,11 @@ FROM jupyter/pyspark-notebook USER root -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + +# Install any missing dependencies for enhanced language service +RUN apt-get install -y libicu[0-9][0-9] # Clean up RUN apt-get autoremove -y \ diff --git a/containers/python-3/.devcontainer/Dockerfile b/containers/python-3/.devcontainer/Dockerfile index ef0749e4ce..85bd62b64a 100644 --- a/containers/python-3/.devcontainer/Dockerfile +++ b/containers/python-3/.devcontainer/Dockerfile @@ -10,11 +10,11 @@ COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json RUN pip install pylint -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install any missing dependencies for enhanced language service -RUN apt-get install -y libicu57 +RUN apt-get install -y libicu[0-9][0-9] # Clean up RUN apt-get autoremove -y \ diff --git a/containers/ruby-2/.devcontainer/Dockerfile b/containers/ruby-2/.devcontainer/Dockerfile index 016d85f720..b13af4b9a7 100644 --- a/containers/ruby-2/.devcontainer/Dockerfile +++ b/containers/ruby-2/.devcontainer/Dockerfile @@ -9,8 +9,8 @@ FROM ruby:2 RUN gem install ruby-debug-ide RUN gem install debase -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \ diff --git a/containers/rust/.devcontainer/Dockerfile b/containers/rust/.devcontainer/Dockerfile index f9a37610dc..ce075732f5 100644 --- a/containers/rust/.devcontainer/Dockerfile +++ b/containers/rust/.devcontainer/Dockerfile @@ -11,8 +11,8 @@ COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json RUN rustup update RUN rustup component add rls rust-analysis rust-src -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install other dependencies RUN apt-get install -y lldb-3.9 diff --git a/containers/swift-4/.devcontainer/Dockerfile b/containers/swift-4/.devcontainer/Dockerfile index 97c254de0d..c0239222b4 100644 --- a/containers/swift-4/.devcontainer/Dockerfile +++ b/containers/swift-4/.devcontainer/Dockerfile @@ -8,8 +8,8 @@ FROM swift:4 # Copy endpoint specific user setting overrides into container COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json -# Install git -RUN apt-get update && apt-get -y install git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Install SourceKite, see https://github.com/vknabel/vscode-swift-development-environment/blob/master/README.md#installation RUN git clone https://github.com/jinmingjian/sourcekite.git diff --git a/containers/typescript-node-8/.devcontainer/Dockerfile b/containers/typescript-node-8/.devcontainer/Dockerfile index b4c2284df1..4c1a803e2d 100644 --- a/containers/typescript-node-8/.devcontainer/Dockerfile +++ b/containers/typescript-node-8/.devcontainer/Dockerfile @@ -5,15 +5,17 @@ FROM node:8-slim -# Install yarn and git -RUN apt-get update \ - && apt-get install -y apt-transport-https \ +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + +# Install yarn +RUN apt-get install -y apt-transport-https \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ - && apt-get install -y yarn git + && apt-get install -y yarn -# Install tslint +# Install tslint and typescript RUN npm install -g tslint typescript # Clean up diff --git a/containers/typescript-node-lts/.devcontainer/Dockerfile b/containers/typescript-node-lts/.devcontainer/Dockerfile index b4c2284df1..4c1a803e2d 100644 --- a/containers/typescript-node-lts/.devcontainer/Dockerfile +++ b/containers/typescript-node-lts/.devcontainer/Dockerfile @@ -5,15 +5,17 @@ FROM node:8-slim -# Install yarn and git -RUN apt-get update \ - && apt-get install -y apt-transport-https \ +# Install git, process tools +RUN apt-get update && apt-get -y install git procps + +# Install yarn +RUN apt-get install -y apt-transport-https \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ && apt-get update \ - && apt-get install -y yarn git + && apt-get install -y yarn -# Install tslint +# Install tslint and typescript RUN npm install -g tslint typescript # Clean up diff --git a/containers/ubuntu-18.04-git/.devcontainer/Dockerfile b/containers/ubuntu-18.04-git/.devcontainer/Dockerfile index e0327b6a3c..5277dde2a4 100644 --- a/containers/ubuntu-18.04-git/.devcontainer/Dockerfile +++ b/containers/ubuntu-18.04-git/.devcontainer/Dockerfile @@ -4,9 +4,8 @@ #----------------------------------------------------------------------------------------- FROM ubuntu:bionic -# Install common tools developers typically will need -RUN apt-get update \ - && apt-get install -y git +# Install git, process tools +RUN apt-get update && apt-get -y install git procps # Clean up RUN apt-get autoremove -y \