diff options
| author |  MarkKoz <[email protected]> | 2019-12-16 14:26:27 -0800 |
|---|---|---|
| committer | MarkKoz <[email protected]> | 2019-12-16 14:27:25 -0800 |
| commit | 6291e84fb3b5f52b0882c06a48a1ddccebaf29c7 (patch) | |
| tree | c3c62ac9f33289b1fb2e7a19ac53859983d9cebd | |
| parent | Merge pull request #51 from python-discord/3-external-libs (diff) | |
CI: fix incorrect CWD for check script
| -rw-r--r-- | azure-pipelines.yml | 1 | ||||
| -rw-r--r-- | docker/base.Dockerfile | 2 |
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 |