From 5834e350db6872b83da5f8da6abbdfe9ea39ceb2 Mon Sep 17 00:00:00 2001 From: Luke Robles Date: Wed, 16 Aug 2017 12:56:41 -0700 Subject: [PATCH 1/2] Switching to alpine linux! Smaller footprints. Fixes #17 --- Dockerfile | 5 ++--- Dockerfile-test-env | 5 ++--- test-dragon-bot.sh | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 778ff7af..44a26e4d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM python:3.6.2-slim +FROM python:3.6.2-alpine3.6 LABEL name="Dragon Bot" -RUN apt-get update && apt-get install curl -y &&\ - curl -Lks get.docker.com | bash +RUN apk update && apk add --no-cache curl vim docker RUN pip install requests discord.py docker pybooru ADD app /app diff --git a/Dockerfile-test-env b/Dockerfile-test-env index 125406c1..30b98543 100644 --- a/Dockerfile-test-env +++ b/Dockerfile-test-env @@ -1,7 +1,6 @@ -FROM python:3.6.2-slim +FROM python:3.6.2-alpine3.6 LABEL name="Dragon Bot Test environment" -RUN apt-get update && apt-get install curl vim -y &&\ - curl -Lks get.docker.com | bash +RUN apk update && apk add --no-cache curl vim docker RUN pip install requests discord.py docker pybooru pylint ADD app /app diff --git a/test-dragon-bot.sh b/test-dragon-bot.sh index b092334d..2b0471da 100755 --- a/test-dragon-bot.sh +++ b/test-dragon-bot.sh @@ -6,5 +6,5 @@ printf "[+] Done\n" # Run that shit and mount the docker socket so it can talk to the sky-factory container printf "\n[-] Running dragon bot in test mode\n" docker build -f ./Dockerfile-test-env -t dragon-bot-test . || exit -docker run -ti --name dragon-bot-test -e DRAGON_ENV=test -v /var/run/docker.sock:/var/run/docker.sock dragon-bot-test bash +docker run -ti --name dragon-bot-test -e DRAGON_ENV=test -v /var/run/docker.sock:/var/run/docker.sock dragon-bot-test sh printf "[+] Done\n" From 25ac0966c72428dc3a4ce22a1d91289b7342376a Mon Sep 17 00:00:00 2001 From: Luke Robles Date: Wed, 16 Aug 2017 12:58:01 -0700 Subject: [PATCH 2/2] Actually we dont even need curl anymore --- Dockerfile | 2 +- Dockerfile-test-env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 44a26e4d..8aa63a52 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM python:3.6.2-alpine3.6 LABEL name="Dragon Bot" -RUN apk update && apk add --no-cache curl vim docker +RUN apk update && apk add --no-cache docker RUN pip install requests discord.py docker pybooru ADD app /app diff --git a/Dockerfile-test-env b/Dockerfile-test-env index 30b98543..51172a9d 100644 --- a/Dockerfile-test-env +++ b/Dockerfile-test-env @@ -1,6 +1,6 @@ FROM python:3.6.2-alpine3.6 LABEL name="Dragon Bot Test environment" -RUN apk update && apk add --no-cache curl vim docker +RUN apk update && apk add --no-cache vim docker RUN pip install requests discord.py docker pybooru pylint ADD app /app