diff options
| author | Egor Tensin <Egor.Tensin@gmail.com> | 2023-05-21 20:40:16 +0200 |
|---|---|---|
| committer | Egor Tensin <Egor.Tensin@gmail.com> | 2023-05-21 20:40:16 +0200 |
| commit | ddd150b7d16d289ed0d0ca8dbbcaa335761ad4f2 (patch) | |
| tree | 7de243930d1359dca8efc32d317441f677f212ac /test/docker | |
| parent | debian: 2.0.3-5 (diff) | |
| parent | move comments from links-update to README (diff) | |
| download | config-links-ddd150b7d16d289ed0d0ca8dbbcaa335761ad4f2.tar.gz config-links-ddd150b7d16d289ed0d0ca8dbbcaa335761ad4f2.zip | |
Merge tag 'v2.0.4' into debian
Diffstat (limited to '')
| -rw-r--r-- | test/docker-compose.yml | 13 | ||||
| -rw-r--r-- | test/docker/Dockerfile | 8 | ||||
| -rw-r--r-- | test/docker/docker-compose.yml | 10 |
3 files changed, 17 insertions, 14 deletions
diff --git a/test/docker-compose.yml b/test/docker-compose.yml deleted file mode 100644 index 76546c4..0000000 --- a/test/docker-compose.yml +++ /dev/null @@ -1,13 +0,0 @@ -version: '3' -services: - test: - build: - context: docker/ - args: - DISTRO: "${DISTRO:-xenial}" - volumes: - - ../:/src - command: - - sh - - -c - - /src/test/unit/test.sh && /src/test/integration/test.sh diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index 5d4d016..04e66da 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -4,6 +4,12 @@ FROM ubuntu:$DISTRO RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive \ - apt-get install -y --no-install-recommends ca-certificates git + apt-get install -y --no-install-recommends ca-certificates git make RUN git config --global --add safe.directory /src + +COPY [".", "/src"] + +WORKDIR /src + +CMD ["make", "test/local", "test/linux-home"] diff --git a/test/docker/docker-compose.yml b/test/docker/docker-compose.yml new file mode 100644 index 0000000..0689ad3 --- /dev/null +++ b/test/docker/docker-compose.yml @@ -0,0 +1,10 @@ +version: '3' +services: + test: + build: + context: ../.. + dockerfile: test/docker/Dockerfile + args: + DISTRO: "${DISTRO:-xenial}" + environment: + CI: y |