From 4f11ec428a5c4862598f11b8a92a65b7d13987ce Mon Sep 17 00:00:00 2001
From: Sebastiaan Zeeff <sebastiaan.zeeff@gmail.com>
Date: Wed, 18 Nov 2020 23:43:57 +0100
Subject: Use repository caching for master build

One problem that our master builds may have is that they retain more and
more layers of old builds, as there is no easy way of purging them from
the cache. As such master cache would not have benefits over using
repository-based caching, I've removed persistent local caching for
non-PR builds.
---
 docker/Dockerfile | 63 -------------------------------------------------------
 1 file changed, 63 deletions(-)
 delete mode 100644 docker/Dockerfile

(limited to 'docker')

diff --git a/docker/Dockerfile b/docker/Dockerfile
deleted file mode 100644
index ea05c5c..0000000
--- a/docker/Dockerfile
+++ /dev/null
@@ -1,63 +0,0 @@
-FROM python:3.9-slim-buster as builder
-RUN apt-get -y update \
-    && apt-get install -y \
-        bison=2:3.3.* \
-        flex=2.6.* \
-        g++=4:8.3.* \
-        gcc=4:8.3.* \
-        git=1:2.20.* \
-        libprotobuf-dev=3.6.* \
-        libnl-route-3-dev=3.4.* \
-        make=4.2.* \
-        pkg-config=0.29-6 \
-        protobuf-compiler=3.6.*
-RUN git clone \
-    -b '2.9' \
-    --single-branch \
-    --depth 1 \
-    https://github.com/google/nsjail.git /nsjail
-WORKDIR /nsjail
-RUN make
-
-FROM python:3.9-slim-buster as base
-ENV PIP_NO_CACHE_DIR=false
-
-RUN apt-get -y update \
-    && apt-get install -y \
-        gcc=4:8.3.* \
-        libnl-route-3-200=3.4.* \
-        libprotobuf17=3.6.* \
-    && rm -rf /var/lib/apt/lists/*
-RUN pip install pipenv==2020.11.4
-
-COPY --from=builder /nsjail/nsjail /usr/sbin/
-RUN chmod +x /usr/sbin/nsjail
-
-FROM base as venv
-ARG DEV
-
-ENV PIP_NO_CACHE_DIR=false \
-    PIPENV_DONT_USE_PYENV=1 \
-    PIPENV_HIDE_EMOJIS=1 \
-    PIPENV_NOSPIN=1
-
-COPY Pipfile Pipfile.lock /snekbox/
-WORKDIR /snekbox
-
-RUN if [ -n "${DEV}" ]; \
-    then \
-        pipenv install --deploy --system --dev; \
-    else \
-        pipenv install --deploy --system; \
-    fi
-
-# At the end to avoid re-installing dependencies when only a config changes.
-COPY config/ /snekbox/config
-
-FROM venv
-
-ENTRYPOINT ["gunicorn"]
-CMD ["-c", "config/gunicorn.conf.py", "snekbox.api.app"]
-
-COPY . /snekbox
-WORKDIR /snekbox
-- 
cgit v1.2.3