From c7d0e065dc094e09c6e2c2fa6f6d59df6ce27fb5 Mon Sep 17 00:00:00 2001 From: Christopher Baklid Date: Thu, 13 Sep 2018 18:02:36 +0000 Subject: use system flag instead of using venv --- docker/Dockerfile | 16 ---------------- docker/Dockerfile.base | 27 --------------------------- docker/base.Dockerfile | 27 +++++++++++++++++++++++++++ docker/bot.Dockerfile | 14 ++++++++++++++ 4 files changed, 41 insertions(+), 43 deletions(-) delete mode 100644 docker/Dockerfile delete mode 100644 docker/Dockerfile.base create mode 100644 docker/base.Dockerfile create mode 100644 docker/bot.Dockerfile (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index 2db1ee24a..000000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM pythondiscord/bot-base:latest - -ENV PIPENV_VENV_IN_PROJECT=1 -ENV PIPENV_IGNORE_VIRTUALENVS=1 -ENV PIPENV_NOSPIN=1 -ENV PIPENV_HIDE_EMOJIS=1 - -RUN pip install pipenv - -COPY . /bot -WORKDIR /bot - -RUN pipenv sync - -ENTRYPOINT ["/sbin/tini", "--"] -CMD ["pipenv", "run", "start"] diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base deleted file mode 100644 index 2f6929e0d..000000000 --- a/docker/Dockerfile.base +++ /dev/null @@ -1,27 +0,0 @@ -FROM python:3.6-alpine3.7 - -RUN apk add --update tini -RUN apk add --update build-base -RUN apk add --update libffi-dev -RUN apk add --update zlib -RUN apk add --update jpeg-dev -RUN apk add --update libxml2 libxml2-dev libxslt-dev -RUN apk add --update zlib-dev -RUN apk add --update freetype-dev - -RUN pip install pipenv - -RUN mkdir /bot -COPY Pipfile /bot -COPY Pipfile.lock /bot -WORKDIR /bot - -ENV LIBRARY_PATH=/lib:/usr/lib -ENV PIPENV_VENV_IN_PROJECT=1 -ENV PIPENV_IGNORE_VIRTUALENVS=1 -ENV PIPENV_NOSPIN=1 -ENV PIPENV_HIDE_EMOJIS=1 - -RUN pipenv install - -# usage: FROM pythondiscord/bot-base:latest diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile new file mode 100644 index 000000000..de2c68c13 --- /dev/null +++ b/docker/base.Dockerfile @@ -0,0 +1,27 @@ +FROM python:3.6-alpine3.7 + +RUN apk add --update tini +RUN apk add --update build-base +RUN apk add --update libffi-dev +RUN apk add --update zlib +RUN apk add --update jpeg-dev +RUN apk add --update libxml2 libxml2-dev libxslt-dev +RUN apk add --update zlib-dev +RUN apk add --update freetype-dev + +RUN pip install pipenv + +RUN mkdir /bot +COPY Pipfile /bot +COPY Pipfile.lock /bot +WORKDIR /bot + +ENV LIBRARY_PATH=/lib:/usr/lib +ENV PIPENV_VENV_IN_PROJECT=1 +ENV PIPENV_IGNORE_VIRTUALENVS=1 +ENV PIPENV_NOSPIN=1 +ENV PIPENV_HIDE_EMOJIS=1 + +RUN pipenv install --deploy --system + +# usage: FROM pythondiscord/bot-base:latest diff --git a/docker/bot.Dockerfile b/docker/bot.Dockerfile new file mode 100644 index 000000000..4713e1f0e --- /dev/null +++ b/docker/bot.Dockerfile @@ -0,0 +1,14 @@ +FROM pythondiscord/bot-base:latest + +ENV PIPENV_VENV_IN_PROJECT=1 +ENV PIPENV_IGNORE_VIRTUALENVS=1 +ENV PIPENV_NOSPIN=1 +ENV PIPENV_HIDE_EMOJIS=1 + +COPY . /bot +WORKDIR /bot + +RUN pipenv install --deploy --system + +ENTRYPOINT ["/sbin/tini", "--"] +CMD ["python", "-m", "bot"] -- cgit v1.2.3