Merged in alpine (pull request #22)

Switching to alpine linux! Smaller footprints. Fixes #17

Approved-by: Luke Robles <lukelrobles@gmail.com>
This commit is contained in:
Luke Robles 2017-08-16 20:02:28 +00:00
commit 72c33a3588
3 changed files with 5 additions and 7 deletions

View File

@ -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 docker
RUN pip install requests discord.py docker pybooru
ADD app /app

View File

@ -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 vim docker
RUN pip install requests discord.py docker pybooru pylint
ADD app /app

View File

@ -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"