From 9eff8ff09bbb5a2a563cf62a6ba4dd11d56092ab Mon Sep 17 00:00:00 2001 From: Arseny Boykov <36469655+Bobronium@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:26:27 +0200 Subject: [PATCH 1/4] [Exchange Oracle] Mount workdir for tests instead of copying it --- packages/examples/cvat/exchange-oracle/docker-compose.test.yml | 2 ++ .../examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/examples/cvat/exchange-oracle/docker-compose.test.yml b/packages/examples/cvat/exchange-oracle/docker-compose.test.yml index 8e02741e6e..321fe01d3b 100644 --- a/packages/examples/cvat/exchange-oracle/docker-compose.test.yml +++ b/packages/examples/cvat/exchange-oracle/docker-compose.test.yml @@ -83,6 +83,8 @@ services: networks: - test-network tty: true + volumes: + - .:/app networks: test-network: diff --git a/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile b/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile index e793fed276..4ac117296e 100644 --- a/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile +++ b/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile @@ -11,6 +11,4 @@ COPY pyproject.toml poetry.lock ./ RUN poetry config virtualenvs.create false \ && poetry install --no-interaction --no-ansi --no-root -COPY . . - CMD ["pytest", "-W", "ignore::DeprecationWarning"] \ No newline at end of file From 7bb4ce3fcee0848ff6e207d81d3ee65389db8b99 Mon Sep 17 00:00:00 2001 From: Arseny Boykov <36469655+Bobronium@users.noreply.github.com> Date: Thu, 15 Aug 2024 15:33:40 +0200 Subject: [PATCH 2/4] [Recording Oracle] Mount workdir for tests instead of copying it --- .../examples/cvat/recording-oracle/docker-compose.test.yml | 5 ++++- .../cvat/recording-oracle/dockerfiles/test.Dockerfile | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/examples/cvat/recording-oracle/docker-compose.test.yml b/packages/examples/cvat/recording-oracle/docker-compose.test.yml index 0d009890e6..7c632516dc 100644 --- a/packages/examples/cvat/recording-oracle/docker-compose.test.yml +++ b/packages/examples/cvat/recording-oracle/docker-compose.test.yml @@ -105,7 +105,10 @@ services: networks: - test-network tty: true - + volumes: + - .:/app + + networks: test-network: driver: bridge \ No newline at end of file diff --git a/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile b/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile index 09c670973a..8f01ce01d2 100644 --- a/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile +++ b/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile @@ -11,6 +11,4 @@ COPY pyproject.toml poetry.lock ./ RUN poetry config virtualenvs.create false \ && poetry install --no-interaction --no-ansi --no-root -COPY . . - CMD ["pytest", "-W", "ignore::DeprecationWarning", "-W", "ignore::RuntimeWarning", "-W", "ignore::UserWarning"] \ No newline at end of file From a48ae1fe62e5af31d0a60df1a3d769d6088e0c95 Mon Sep 17 00:00:00 2001 From: Arseny Boykov <36469655+Bobronium@users.noreply.github.com> Date: Fri, 16 Aug 2024 13:23:06 +0200 Subject: [PATCH 3/4] [Recording/Exchange Oracle] Mount cache for poetry --- .../examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile | 2 +- .../examples/cvat/recording-oracle/dockerfiles/test.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile b/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile index 4ac117296e..0daea1805c 100644 --- a/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile +++ b/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -y && \ COPY pyproject.toml poetry.lock ./ -RUN poetry config virtualenvs.create false \ +RUN --mount=type=cache,target=/root/.cache poetry config virtualenvs.create false \ && poetry install --no-interaction --no-ansi --no-root CMD ["pytest", "-W", "ignore::DeprecationWarning"] \ No newline at end of file diff --git a/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile b/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile index 8f01ce01d2..d7134459da 100644 --- a/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile +++ b/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update -y && \ COPY pyproject.toml poetry.lock ./ -RUN poetry config virtualenvs.create false \ +RUN --mount=type=cache,target=/root/.cache poetry config virtualenvs.create false \ && poetry install --no-interaction --no-ansi --no-root CMD ["pytest", "-W", "ignore::DeprecationWarning", "-W", "ignore::RuntimeWarning", "-W", "ignore::UserWarning"] \ No newline at end of file From 26a58b4d225ded2a5b08d4fac82204f29bc5da50 Mon Sep 17 00:00:00 2001 From: Arseny Boykov <36469655+Bobronium@users.noreply.github.com> Date: Fri, 16 Aug 2024 13:23:46 +0200 Subject: [PATCH 4/4] [Recording/Exchange Oracle] Add libhdf5-dev to the test.Dockerfile --- .../examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile | 2 +- .../examples/cvat/recording-oracle/dockerfiles/test.Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile b/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile index 0daea1805c..e1b9ecb910 100644 --- a/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile +++ b/packages/examples/cvat/exchange-oracle/dockerfiles/test.Dockerfile @@ -3,7 +3,7 @@ FROM python:3.10 WORKDIR /app RUN apt-get update -y && \ - apt-get install -y jq ffmpeg libsm6 libxext6 && \ + apt-get install -y jq ffmpeg libsm6 libxext6 libhdf5-dev && \ pip install poetry COPY pyproject.toml poetry.lock ./ diff --git a/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile b/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile index d7134459da..a39d09edc7 100644 --- a/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile +++ b/packages/examples/cvat/recording-oracle/dockerfiles/test.Dockerfile @@ -3,7 +3,7 @@ FROM python:3.10 WORKDIR /app RUN apt-get update -y && \ - apt-get install -y jq ffmpeg libsm6 libxext6 && \ + apt-get install -y jq ffmpeg libsm6 libxext6 libhdf5-dev && \ pip install poetry COPY pyproject.toml poetry.lock ./