Bug fixes

Author: Chuxel

containers/docker-in-docker-compose/README.md

@@ -25,7 +25,10 @@ You can adapt your own existing development container Docker Compose setup to su
 1. First, install the Docker CLI in your dev container. From `.devcontainer/Dockerfile`:
 
     ```Dockerfile
-    RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
+    RUN apt-get update \
+        #
+        # Install Docker CE CLI
+        && apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
         && curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \
         && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
         && apt-get update \

containers/docker-in-docker/README.md

@@ -25,8 +25,10 @@ You can adapt your own existing development container Dockerfile to support this
 1. First, install the Docker CLI in your container. From `.devcontainer/Dockerfile`:
 
     ```Dockerfile
-    # Install Docker CE CLI
-    RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
+    RUN apt-get update \
+        #
+        # Install Docker CE CLI
+        && apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
         && curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \
         && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
         && apt-get update \

containers/kubernetes-helm/.devcontainer/Dockerfile

@@ -26,7 +26,7 @@ RUN apt-get update \
     && apt-get install -y docker-ce-cli \
     #
     # Install kubectl
-    && curl -sSLO -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
+    && curl -sSL -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
     && chmod +x /usr/local/bin/kubectl \
     #
     # Install Helm

containers/kubernetes-helm/README.md

@@ -76,21 +76,21 @@ You can adapt your own existing development container Dockerfile to support this
 4. Finally, update your Dockerfile to install all of the needed CLIs in the container. From `.devcontainer/Dockerfile`:
 
     ```Dockerfile
-    # Install Docker CE CLI
-    RUN apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
+    RUN apt-get update \
+        #
+        # Install Docker CE CLI
+        && apt-get install -y apt-transport-https ca-certificates curl gnupg-agent software-properties-common lsb-release \
         && curl -fsSL https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]')/gpg | apt-key add - 2>/dev/null \
         && add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/$(lsb_release -is | tr '[:upper:]' '[:lower:]') $(lsb_release -cs) stable" \
         && apt-get update \
-        && apt-get install -y docker-ce-cli
-
-    # Install kubectl
-    RUN curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - 2>/dev/null \
-        && echo "deb https://apt.kubernetes.io/ kubernetes-$(lsb_release -cs) main" | tee -a /etc/apt/sources.list.d/kubernetes.list \
-        && apt-get update \
-        && apt-get install -y kubectl
-
-    # Install Helm
-    RUN curl -s https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash -
+        && apt-get install -y docker-ce-cli \
+        #
+        # Install kubectl
+        && curl -sSL -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl \
+        && chmod +x /usr/local/bin/kubectl \
+        #
+        # Install Helm
+        curl -s https://raw.githubusercontent.com/helm/helm/master/scripts/get | bash -
     ```
 
 5. Press <kbd>F1</kbd> and run **Remote-Containers: Rebuild Container** so the changes take effect.

containers/ruby-2-rails-5/.devcontainer/Dockerfile

@@ -10,13 +10,12 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
     # Install vim, git, process tools, lsb-release
-    RUN apt-get update \
-        && apt-get install -y \
-            vim \
-            git \
-            procps \
-            lsb-release \
-    #
+    && apt-get install -y \
+        vim \
+        git \
+        procps \
+        lsb-release \
+#
     # Install ruby
     && apt-get install -y \
         ruby \

containers/ruby-2-rails-5/.devcontainer/devcontainer.json

@@ -12,6 +12,6 @@
 	// "postCreateCommand": "cd ${input:projectName} && bundle install",
 
 	"extensions": [
-		"rebornix.Ruby", 
+		"rebornix.Ruby"
 	]
 }

containers/ruby-2-sinatra/.devcontainer/Dockerfile

@@ -10,7 +10,6 @@ RUN apt-get update \
     && apt-get -y install --no-install-recommends apt-utils 2>&1 \
     #
     # Install vim, git, process tools, lsb-release
-    && apt-get update \
     && apt-get install -y \
         vim \
         git \