diff options
| author |  MarkKoz <[email protected]> | 2019-12-14 23:15:16 -0800 |
|---|---|---|
| committer | MarkKoz <[email protected]> | 2019-12-14 23:15:16 -0800 |
| commit | 352d729d52fa214ccca899202b3013ccfc627a61 (patch) | |
| tree | 329ca6da9e42e07c8024e8e70725309365c8799d | |
| parent | Add external libraries (diff) | |
Switch Docker base image to Debian Buster
Unlike Alpine, Python manylinux wheels work on Debian because it's a
glibc-based distro.
| -rw-r--r-- | docker/base.Dockerfile | 36 |
1 files changed, 19 insertions, 17 deletions
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index 3c5d7de..03816fb 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -1,15 +1,16 @@ -FROM python:3.8.0-alpine3.10 as builder -RUN apk add --no-cache --update \ - bison~=3.3 \ - bsd-compat-headers~=0.7 \ - flex~=2.6 \ - g++~=8.3 \ - gcc~=8.3 \ - git~=2.22 \ - libnl3-dev~=3.4 \ - linux-headers~=4.19 \ - make~=4.2 \ - protobuf-dev~=3.6 +FROM python:3.8.0-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 \ @@ -18,12 +19,13 @@ RUN git clone \ WORKDIR /nsjail RUN make -FROM python:3.8.0-alpine3.10 +FROM python:3.8.0-slim-buster ENV PIP_NO_CACHE_DIR=false -RUN apk add --no-cache --update \ - libnl3~=3.4 \ - libstdc++~=8.3 \ - protobuf~=3.6 +RUN apt-get -y update \ + && apt-get install -y \ + libnl-route-3-200=3.4.* \ + libprotobuf17=3.6.* \ + && rm -rf /var/lib/apt/lists/* RUN pip install pipenv==2018.11.26 COPY --from=builder /nsjail/nsjail /usr/sbin/ RUN chmod +x /usr/sbin/nsjail |