diff options
| author | Egor Tensin <egor@tensin.name> | 2026-10-14 19:14:04 +0500 |
|---|---|---|
| committer | Egor Tensin <egor@tensin.name> | 2026-10-14 19:14:04 +0500 |
| commit | edc5292b8fd8d0db7020691d24e034a7744c1dc6 (patch) | |
| tree | d316092d14d6a15f193bc603dfd7b3e3e839fb00 /test/docker | |
| parent | debian: v2.1.11-1 (diff) | |
| parent | test: upgrade test-harness (diff) | |
| download | config-links-edc5292b8fd8d0db7020691d24e034a7744c1dc6.tar.gz config-links-edc5292b8fd8d0db7020691d24e034a7744c1dc6.zip | |
Merge tag 'v2.1.12' into debian
v2.1.12
Diffstat (limited to 'test/docker')
| -rw-r--r-- | test/docker/Dockerfile | 11 | ||||
| -rw-r--r-- | test/docker/docker-compose.yml | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 8cbae4f..4014b8b 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -3,13 +3,14 @@ ARG DISTRO=xenial FROM ubuntu:$DISTRO RUN apt update && \ - DEBIAN_FRONTEND=noninteractive \ - apt install -y --no-install-recommends ca-certificates git make + DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \ + ca-certificates \ + git \ + make -RUN git config --global --add safe.directory /src +# Run unsafe tests: +ENV CI=y COPY [".", "/src"] - WORKDIR /src - CMD ["make", "test"] diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml index 05f1f6a..20ecc1e 100644 --- a/test/docker/docker-compose.yml +++ b/test/docker/docker-compose.yml @@ -5,5 +5,3 @@ services: dockerfile: test/docker/Dockerfile args: DISTRO: "${DISTRO:-xenial}" - environment: - CI: y |