diff options
| author |  Gareth Coles <[email protected]> | 2018-11-17 17:21:35 +0000 |
|---|---|---|
| committer | Gareth Coles <[email protected]> | 2018-11-17 17:21:35 +0000 |
| commit | 4aca6a16d922119c0bae738a56b01981b6025930 (patch) | |
| tree | a4134961df81f5adb3f0220bf8248f3ca5df023b | |
| parent | Merge branch 'help_aliases_parents' into 'master' (diff) | |
Clean up docker images
| -rw-r--r-- | docker/base.Dockerfile | 11 | ||||
| -rw-r--r-- | docker/bot.Dockerfile | 7 |
2 files changed, 5 insertions, 13 deletions
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index de2c68c13..a1ec0866e 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -9,19 +9,8 @@ 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 index d4968fbfa..5a07a612b 100644 --- a/docker/bot.Dockerfile +++ b/docker/bot.Dockerfile @@ -5,10 +5,13 @@ ENV PIPENV_IGNORE_VIRTUALENVS=1 ENV PIPENV_NOSPIN=1 ENV PIPENV_HIDE_EMOJIS=1 +RUN pip install -U pipenv + +RUN mkdir -p /bot COPY . /bot WORKDIR /bot -RUN pipenv install --deploy --system --sequential +RUN pipenv install --deploy ENTRYPOINT ["/sbin/tini", "--"] -CMD ["python", "-m", "bot"] +CMD ["pipenv", "run", "start"] |