From c29ff26098713d049cea16cc8b25ae5d4ca98d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Pobo=C5=99il?= Date: Tue, 21 Nov 2017 18:31:11 +0100 Subject: [PATCH 1/4] Changed Machine download to always newest version --- Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad1854f..e10a739 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,13 @@ ENV DOCKER_MACHINE_PORT=2376 RUN apk -q update && apk add bash docker curl openssh-client py2-pip -RUN pip install docker-compose -RUN docker-compose --version +RUN pip install docker-compose \ + && docker-compose --version -RUN curl -L https://github.com/docker/machine/releases/download/v0.8.2/docker-machine-`uname -s`-`uname -m` > /usr/bin/docker-machine && chmod +x /usr/bin/docker-machine -RUN docker-machine --version +RUN DOWNLOAD_URL=$(curl -s https://api.github.com/repos/docker/machine/releases/latest | grep browser_download_url | cut -d '"' -f 4 | grep `uname -s`-`uname -m`) \ + && curl -L $DOWNLOAD_URL > /usr/bin/docker-machine \ + && chmod +x /usr/bin/docker-machine \ + && docker-machine --version RUN pip install awscli From 032890a53d2300f4773a756659b377f3ed769f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Pobo=C5=99il?= Date: Mon, 18 Dec 2017 16:29:27 +0100 Subject: [PATCH 2/4] Improved README. --- README.md | 34 ++++++++++++++++++++++------------ 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 96fdd1e..e6c6415 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,22 @@ -usage: - - docker run --rm \ - -e DOCKER_MACHINE_NAME= \ - -e DOCKER_MACHINE_URL= \ - -e DOCKER_MACHINE_PORT= \ - -e DOCKER_MACHINE_CA_CERT= \ - -e DOCKER_MACHINE_CA_CERT_KEY= \ - -e DOCKER_MACHINE_CERT= \ - -e DOCKER_MACHINE_CERT_KEY= \ - raketenbasis/docker-machine \ - docker run -d --name nginx -p 80:80 nginx:latest +# Usage + +``` +docker run --rm -it \ + -e DOCKER_MACHINE_NAME= \ + -e DOCKER_MACHINE_URL= \ + -e DOCKER_MACHINE_PORT= \ + -e DOCKER_MACHINE_CA_CERT="$(cat ca.pem )" \ + -e DOCKER_MACHINE_CA_CERT_KEY="$(cat ca-key.pem )" \ + -e DOCKER_MACHINE_CERT="$(cat cert.pem )" \ + -e DOCKER_MACHINE_CERT_KEY="$(cat key.pem )" \ + raketenbasis/docker-machine bash +``` + +## About certificates + +Docker Machine use the same certificates for all created machines, so if you want to share them (e.g. in CI) for connecting to machine created by you, create machine with option `--storage-path` with path specific for this specific machine, so it will create certificates only for this machine. + +Example: +``` +docker-machine --storage-path ~/.docker/machine/machines/citest/ create --driver digitalocean citest +``` From b40f2597ccccfd1e1da2a9c4c5cf2d56c4d5c691 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Pobo=C5=99il?= Date: Mon, 18 Dec 2017 16:30:02 +0100 Subject: [PATCH 3/4] Optimized layers size. --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index ad1854f..402caf3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,15 +3,16 @@ FROM alpine:edge ENV DOCKER_MACHINE_NAME=default ENV DOCKER_MACHINE_PORT=2376 -RUN apk -q update && apk add bash docker curl openssh-client py2-pip +RUN apk add --no-cache bash docker curl openssh-client py2-pip -RUN pip install docker-compose -RUN docker-compose --version +RUN pip install docker-compose \ + && docker-compose --version RUN curl -L https://github.com/docker/machine/releases/download/v0.8.2/docker-machine-`uname -s`-`uname -m` > /usr/bin/docker-machine && chmod +x /usr/bin/docker-machine RUN docker-machine --version -RUN pip install awscli +RUN pip install awscli \ + && aws --version COPY entrypoint.sh / From ec33d3b214a1202a30aac2f9a607c5cd18d1c666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Honza=20Pobo=C5=99il?= Date: Mon, 18 Dec 2017 16:30:33 +0100 Subject: [PATCH 4/4] Changed Machine installation to download always the newest version. --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 402caf3..cc8d4e8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,10 @@ RUN apk add --no-cache bash docker curl openssh-client py2-pip RUN pip install docker-compose \ && docker-compose --version -RUN curl -L https://github.com/docker/machine/releases/download/v0.8.2/docker-machine-`uname -s`-`uname -m` > /usr/bin/docker-machine && chmod +x /usr/bin/docker-machine -RUN docker-machine --version +RUN DOWNLOAD_URL=$(curl -s https://api.github.com/repos/docker/machine/releases | grep browser_download_url | cut -d '"' -f 4 | grep -m 1 docker-machine-`uname -s`-`uname -m`) \ + && curl -L $DOWNLOAD_URL > /usr/bin/docker-machine \ + && chmod +x /usr/bin/docker-machine \ + && docker-machine --version RUN pip install awscli \ && aws --version