Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Chuxel committed Jun 14, 2019
1 parent ddadb45 commit bf66dd4
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 25 deletions.
5 changes: 4 additions & 1 deletion containers/docker-in-docker-compose/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 4 additions & 2 deletions containers/docker-in-docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion containers/kubernetes-helm/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions containers/kubernetes-helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
13 changes: 6 additions & 7 deletions containers/ruby-2-rails-5/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion containers/ruby-2-rails-5/.devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
// "postCreateCommand": "cd ${input:projectName} && bundle install",

"extensions": [
"rebornix.Ruby",
"rebornix.Ruby"
]
}
1 change: 0 additions & 1 deletion containers/ruby-2-sinatra/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit bf66dd4

Please sign in to comment.