From bf66dd433c303659b316db9c47af7cb4d6c6a7e9 Mon Sep 17 00:00:00 2001 From: Chuck Lantz Date: Fri, 14 Jun 2019 13:56:51 +0000 Subject: [PATCH] Bug fixes --- containers/docker-in-docker-compose/README.md | 5 +++- containers/docker-in-docker/README.md | 6 +++-- .../kubernetes-helm/.devcontainer/Dockerfile | 2 +- containers/kubernetes-helm/README.md | 24 +++++++++---------- .../ruby-2-rails-5/.devcontainer/Dockerfile | 13 +++++----- .../.devcontainer/devcontainer.json | 2 +- .../ruby-2-sinatra/.devcontainer/Dockerfile | 1 - 7 files changed, 28 insertions(+), 25 deletions(-) diff --git a/containers/docker-in-docker-compose/README.md b/containers/docker-in-docker-compose/README.md index d1534800d9..2e51afb032 100644 --- a/containers/docker-in-docker-compose/README.md +++ b/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 \ diff --git a/containers/docker-in-docker/README.md b/containers/docker-in-docker/README.md index 1b5d0af527..56205bf309 100644 --- a/containers/docker-in-docker/README.md +++ b/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 \ diff --git a/containers/kubernetes-helm/.devcontainer/Dockerfile b/containers/kubernetes-helm/.devcontainer/Dockerfile index 1fff23edfd..1698b20c42 100644 --- a/containers/kubernetes-helm/.devcontainer/Dockerfile +++ b/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 diff --git a/containers/kubernetes-helm/README.md b/containers/kubernetes-helm/README.md index 3d14c00f9e..857315d76c 100644 --- a/containers/kubernetes-helm/README.md +++ b/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 F1 and run **Remote-Containers: Rebuild Container** so the changes take effect. diff --git a/containers/ruby-2-rails-5/.devcontainer/Dockerfile b/containers/ruby-2-rails-5/.devcontainer/Dockerfile index 867fae0678..d64d633536 100644 --- a/containers/ruby-2-rails-5/.devcontainer/Dockerfile +++ b/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 \ diff --git a/containers/ruby-2-rails-5/.devcontainer/devcontainer.json b/containers/ruby-2-rails-5/.devcontainer/devcontainer.json index a7cb746e6c..60e217ae8f 100644 --- a/containers/ruby-2-rails-5/.devcontainer/devcontainer.json +++ b/containers/ruby-2-rails-5/.devcontainer/devcontainer.json @@ -12,6 +12,6 @@ // "postCreateCommand": "cd ${input:projectName} && bundle install", "extensions": [ - "rebornix.Ruby", + "rebornix.Ruby" ] } \ No newline at end of file diff --git a/containers/ruby-2-sinatra/.devcontainer/Dockerfile b/containers/ruby-2-sinatra/.devcontainer/Dockerfile index 3731349629..0b7bff86af 100644 --- a/containers/ruby-2-sinatra/.devcontainer/Dockerfile +++ b/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 \