diff options
| author |  sco1 <[email protected]> | 2019-03-26 14:53:13 -0400 |
|---|---|---|
| committer | sco1 <[email protected]> | 2019-03-26 14:53:13 -0400 |
| commit | 0bc509af4c7e5184a575763279756dac0a425dab (patch) | |
| tree | e444b611009bd084a7148a4724ed3f9a446e2b8a /docker | |
| parent | Respect docstring summary/description spacing. (diff) | |
| parent | Merge pull request #132 from python-discord/dpy-cog-changes (diff) | |
Merge branch 'master' into flake8-docstring
Resolve merge conflicts
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 30 | ||||
| -rw-r--r-- | docker/docker-compose.yml | 3 |
2 files changed, 22 insertions, 11 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index edeb5b50..1445441c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,15 +1,25 @@ -FROM python:3.7-alpine3.7 -RUN apk add --update libffi-dev tini build-base git jpeg-dev zlib zlib-dev +FROM python:3.7.2-alpine3.9 -RUN mkdir /bot -COPY . /bot -WORKDIR /bot +ENTRYPOINT ["python"] +CMD ["-m", "bot"] -ENV LIBRARY_PATH=/lib:/usr/lib \ - PIPENV_VENV_IN_PROJECT=1 +ENV PIP_NO_CACHE_DIR="false" \ + PIPENV_DONT_USE_PYENV="1" \ + PIPENV_HIDE_EMOJIS="1" \ + PIPENV_IGNORE_VIRTUALENVS="1" \ + PIPENV_NOSPIN="1" +RUN apk add --no-cache --update \ + build-base \ + git \ + libffi-dev \ + # Pillow dependencies + freetype-dev \ + libjpeg-turbo-dev \ + zlib-dev RUN pip install pipenv -RUN pipenv install --deploy --system -ENTRYPOINT ["/sbin/tini", "--"] -CMD ["python", "-m", "bot"] +COPY . /bot +WORKDIR /bot + +RUN pipenv install --deploy --system diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index de1f4cf2..6e274451 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,8 +1,9 @@ -version: "3" +version: "3.7" services: dumbo: image: pythondiscord/seasonalbot:latest container_name: seasonalbot + init: true restart: always |