aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Mark <[email protected]>2019-12-16 14:37:43 -0800
committerGravatar GitHub <[email protected]>2019-12-16 14:37:43 -0800
commit90f5f3b7532006d8c615e53f2baa7625cdde2740 (patch)
treec3c62ac9f33289b1fb2e7a19ac53859983d9cebd
parentMerge pull request #51 from python-discord/3-external-libs (diff)
parentCI: fix incorrect CWD for check script (diff)
Merge pull request #52 from python-discord/ci-test
CI: fix incorrect CWD for check script
-rw-r--r--azure-pipelines.yml1
-rw-r--r--docker/base.Dockerfile2
2 files changed, 3 insertions, 0 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index f86b388..3559031 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -13,6 +13,7 @@ jobs:
name: check
inputs:
scriptPath: scripts/check_dockerfiles.sh
+ disableAutoCwd: true
# Without a login the following Docker build tasks won't add image tags.
- task: Docker@1
diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile
index 6a63b12..bbd0110 100644
--- a/docker/base.Dockerfile
+++ b/docker/base.Dockerfile
@@ -21,6 +21,7 @@ RUN make
FROM python:3.8.0-slim-buster
ENV PIP_NO_CACHE_DIR=false
+
RUN apt-get -y update \
&& apt-get install -y \
gcc=4:8.3.* \
@@ -28,5 +29,6 @@ RUN apt-get -y update \
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