aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorGravatar Christopher Baklid <[email protected]>2018-06-05 20:55:56 +0200
committerGravatar Christopher Baklid <[email protected]>2018-06-05 20:55:56 +0200
commit2eee1d50fd2b9ad1e938a3b2186a6c1874f30e42 (patch)
tree55cd90979cf25f52808be25de50d9a8221ebcaa9 /docker
parentUpdate README.md (diff)
CI
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile19
-rw-r--r--docker/base.Dockerfile23
2 files changed, 25 insertions, 17 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2c707a1..e8fa8a5 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,25 +1,10 @@
-FROM python:3.6-alpine3.7
-
-RUN apk add --no-cache libstdc++ protobuf
-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=/snekbox
-
-RUN pip install pipenv
+FROM pythondiscord/snekbox-base:latest
RUN mkdir -p /snekbox
-COPY Pipfile /snekbox
-COPY Pipfile.lock /snekbox
COPY . /snekbox
WORKDIR /snekbox
+RUN pipenv --rm
RUN pipenv sync
-RUN cp binaries/nsjail2.5-alpine-x86_64 /usr/sbin/nsjail
-RUN chmod +x /usr/sbin/nsjail
-
CMD ["pipenv", "run", "snekbox"]
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
new file mode 100644
index 0000000..ad2b7a1
--- /dev/null
+++ b/docker/base.Dockerfile
@@ -0,0 +1,23 @@
+FROM python:3.6-alpine3.7
+
+RUN apk add --no-cache libstdc++ protobuf
+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=/snekbox
+
+RUN pip install pipenv
+
+RUN mkdir -p /snekbox
+COPY Pipfile /snekbox
+COPY Pipfile.lock /snekbox
+COPY . /snekbox
+WORKDIR /snekbox
+
+RUN pipenv sync --dev
+
+RUN cp binaries/nsjail2.5-alpine-x86_64 /usr/sbin/nsjail
+RUN chmod +x /usr/sbin/nsjail