diff options
| author |  Johannes Christ <[email protected]> | 2019-01-01 19:22:48 +0100 |
|---|---|---|
| committer | Johannes Christ <[email protected]> | 2019-01-01 19:22:48 +0100 |
| commit | 06d866fbffff87913e05f6c0b3b5ba788e9def06 (patch) | |
| tree | bd8d7edf9729c0c6ba1bdfeec8e31fac99963e17 /docker | |
| parent | Remove superfluous `self.headers` setting. (diff) | |
| parent | Merge pull request #242 from python-discord/eval-indent-fix (diff) | |
Merge branch 'master' into django
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base.Dockerfile | 12 | ||||
| -rw-r--r-- | docker/bot.Dockerfile | 7 |
2 files changed, 6 insertions, 13 deletions
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index de2c68c13..e46db756a 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -8,20 +8,10 @@ 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 +RUN apk add --update git 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 4713e1f0e..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 +RUN pipenv install --deploy ENTRYPOINT ["/sbin/tini", "--"] -CMD ["python", "-m", "bot"] +CMD ["pipenv", "run", "start"] |