From 7db43f841bed333bb8fea82f7fc4156b5e6edcaf Mon Sep 17 00:00:00 2001
From: Krystan Honour <krystan@gmail.com>
Date: Sat, 8 Jun 2019 19:19:46 +0100
Subject: [PATCH] placed comments back in and continue with layers that are
 more optimal as suggested.

---
 .../.devcontainer/Dockerfile                  |  1 -
 .../.devcontainer/Dockerfile                  | 31 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/containers/typescript-node-8/.devcontainer/Dockerfile b/containers/typescript-node-8/.devcontainer/Dockerfile
index f880bb2164..4e17cbcdb2 100644
--- a/containers/typescript-node-8/.devcontainer/Dockerfile
+++ b/containers/typescript-node-8/.devcontainer/Dockerfile
@@ -11,7 +11,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash
 
-
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     # Verify git and needed tools are installed
diff --git a/containers/typescript-node-lts/.devcontainer/Dockerfile b/containers/typescript-node-lts/.devcontainer/Dockerfile
index dfb8c6b062..3686104a59 100644
--- a/containers/typescript-node-lts/.devcontainer/Dockerfile
+++ b/containers/typescript-node-lts/.devcontainer/Dockerfile
@@ -5,33 +5,32 @@
 
 FROM node:lts
 
-# Configure apt
 ENV DEBIAN_FRONTEND=noninteractive
+
+# Set the default shell to bash instead of sh
+ENV SHELL /bin/bash
+
+# Configure apt
 RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1
 
 # Verify git and needed tools are installed
-RUN apt-get install -y git procps
-
-# Remove outdated yarn from /opt and install via package 
-# so it can be easily updated via apt-get upgrade yarn
-RUN rm -rf /opt/yarn-* \
+RUN apt-get install -y git procps \
+    # Remove outdated yarn from /opt and install via package 
+    # so it can be easily updated via apt-get upgrade yarn
+    && rm -rf /opt/yarn-* \
     && rm -f /usr/local/bin/yarn \
     && rm -f /usr/local/bin/yarnpkg \
     && apt-get install -y curl apt-transport-https lsb-release \
     && curl -sS https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/pubkey.gpg | apt-key add - 2>/dev/null \
     && echo "deb https://dl.yarnpkg.com/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/ stable main" | tee /etc/apt/sources.list.d/yarn.list \
     && apt-get update \
-    && apt-get -y install --no-install-recommends yarn
-
-# Install tslint and typescript
-RUN npm install -g tslint typescript
-
-# Clean up
-RUN apt-get autoremove -y \
+    && apt-get -y install --no-install-recommends yarn \
+    # Install tslint and typescript
+    && npm install -g tslint typescript \
+    # Clean up
+    && apt-get autoremove -y \
     && apt-get clean -y \
     && rm -rf /var/lib/apt/lists/*
-ENV DEBIAN_FRONTEND=dialog
 
-# Set the default shell to bash instead of sh
-ENV SHELL /bin/bash
\ No newline at end of file
+ENV DEBIAN_FRONTEND=dialog
\ No newline at end of file