diff options
| author |  Mark <[email protected]> | 2019-12-08 11:32:28 -0800 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2019-12-08 11:32:28 -0800 |
| commit | a4a8805587dc8e011fc2aa4276cc71631c58702a (patch) | |
| tree | 46e8245b82428c3183f3f5cf75cf80fe9a330e3a /docker | |
| parent | Merge pull request #49 from makusu2/fixsync (diff) | |
| parent | Update flake8-annotations for Python 3.8 support (diff) | |
Merge pull request #50 from python-discord/python-3.8
Update to Python 3.8
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base.Dockerfile | 12 | ||||
| -rw-r--r-- | docker/venv.Dockerfile | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index 1edff49..3c5d7de 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.10 as builder +FROM python:3.8.0-alpine3.10 as builder RUN apk add --no-cache --update \ bison~=3.3 \ bsd-compat-headers~=0.7 \ @@ -10,13 +10,15 @@ RUN apk add --no-cache --update \ linux-headers~=4.19 \ make~=4.2 \ protobuf-dev~=3.6 -RUN git clone https://github.com/google/nsjail.git /nsjail \ - && cd /nsjail \ - && git checkout 0b1d5ac03932c140f08536ed72b4b58741e7d3cf +RUN git clone \ + -b '2.9' \ + --single-branch \ + --depth 1 \ + https://github.com/google/nsjail.git /nsjail WORKDIR /nsjail RUN make -FROM python:3.7.4-alpine3.10 +FROM python:3.8.0-alpine3.10 ENV PIP_NO_CACHE_DIR=false RUN apk add --no-cache --update \ libnl3~=3.4 \ diff --git a/docker/venv.Dockerfile b/docker/venv.Dockerfile index 85188fd..be15f08 100644 --- a/docker/venv.Dockerfile +++ b/docker/venv.Dockerfile @@ -10,4 +10,4 @@ ENV PIP_NO_CACHE_DIR=false \ COPY Pipfile Pipfile.lock /snekbox/ WORKDIR /snekbox -RUN if [ -n "${DEV}" ]; pipenv sync --dev; then pipenv sync; fi +RUN if [ -n "${DEV}" ]; then pipenv sync --dev; else pipenv sync; fi |