diff options
| author |  Johannes Christ <[email protected]> | 2019-01-12 14:31:25 +0100 |
|---|---|---|
| committer | Johannes Christ <[email protected]> | 2019-01-12 14:31:25 +0100 |
| commit | 445e44731b632f05a74e652029d3d98ef083ced0 (patch) | |
| tree | ecb7798ea2cb03e7caa79d1b663750ebeda16039 /docker | |
| parent | Support obtaining individual rules via `!site rules` command. (diff) | |
Use a single `Dockerfile` instead of two.
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base.Dockerfile | 17 | ||||
| -rw-r--r-- | docker/bot.Dockerfile | 17 |
2 files changed, 0 insertions, 34 deletions
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile deleted file mode 100644 index e46db756a..000000000 --- a/docker/base.Dockerfile +++ /dev/null @@ -1,17 +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 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 diff --git a/docker/bot.Dockerfile b/docker/bot.Dockerfile deleted file mode 100644 index 5a07a612b..000000000 --- a/docker/bot.Dockerfile +++ /dev/null @@ -1,17 +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 -U pipenv - -RUN mkdir -p /bot -COPY . /bot -WORKDIR /bot - -RUN pipenv install --deploy - -ENTRYPOINT ["/sbin/tini", "--"] -CMD ["pipenv", "run", "start"] |