diff options
| author |  Mark <[email protected]> | 2019-03-28 13:45:18 -0700 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-03-28 13:45:18 -0700 |
| commit | f8014521f7095aeba9344bb6c529ee57111d72e1 (patch) | |
| tree | 2e61ab7e85b0cd31d80b60e88fdc7bf105bc0018 /docker | |
| parent | Add Azure CI. (#16) (diff) | |
| parent | Merge remote-tracking branch 'origin' into rmq_removal (diff) | |
Replace RMQ with a POST endpoint (#7)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/Dockerfile.webapp | 25 |
2 files changed, 3 insertions, 25 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index e8fa8a5..b8d5637 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,7 @@ FROM pythondiscord/snekbox-base:latest +RUN apk add --update tini + RUN mkdir -p /snekbox COPY . /snekbox WORKDIR /snekbox @@ -7,4 +9,5 @@ WORKDIR /snekbox RUN pipenv --rm RUN pipenv sync +ENTRYPOINT ["/sbin/tini", "--"] CMD ["pipenv", "run", "snekbox"] diff --git a/docker/Dockerfile.webapp b/docker/Dockerfile.webapp deleted file mode 100644 index 988926d..0000000 --- a/docker/Dockerfile.webapp +++ /dev/null @@ -1,25 +0,0 @@ -FROM python:3.6.6-alpine3.7 - -RUN apk add --update tini -RUN apk add --update build-base - -ENV PIPENV_VENV_IN_PROJECT=1 -ENV PIPENV_IGNORE_VIRTUALENVS=1 -ENV PIPENV_NOSPIN=1 -ENV PIPENV_HIDE_EMOJIS=1 -ENV PYTHONPATH=/webapp - -RUN pip install pipenv - -RUN mkdir -p /webapp -COPY Pipfile /webapp -COPY Pipfile.lock /webapp -COPY . /webapp -WORKDIR /webapp - -RUN pipenv sync --dev - -EXPOSE 5000 - -ENTRYPOINT ["/sbin/tini", "--"] -CMD ["pipenv", "run", "snekweb"] |