Fix 'Docker' configurations

lycantropos · Apr 5, 2023 · 43c4f4a · 43c4f4a
1 parent ee1929e
commit 43c4f4a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 27 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,21 +3,13 @@ ARG IMAGE_VERSION
 
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
-RUN pip install --upgrade pip setuptools
-
 WORKDIR /opt/voronoi
 
-COPY requirements-setup.txt .
-COPY requirements-tests.txt .
-RUN pip install --force-reinstall -r requirements-tests.txt
-COPY requirements.txt .
-
-COPY include/ include/
-COPY src/ src/
-COPY tests/ tests/
-COPY voronoi voronoi/
+COPY pyproject.toml .
 COPY README.md .
-COPY pytest.ini .
 COPY setup.py .
+COPY voronoi voronoi/
+COPY src/ src/
+COPY tests/ tests/
 
-RUN pip install -e .
+RUN pip install -e .[tests]
diff --git a/docker-compose.cpython.yml b/docker-compose.cpython.yml
@@ -9,14 +9,10 @@ services:
         - IMAGE_VERSION=${CPYTHON_IMAGE_VERSION}
     image: lycantropos/voronoi-cpython:0.3.1
     volumes:
-      - ./voronoi/:/opt/voronoi/voronoi/
-      - ./include/:/opt/voronoi/include/
-      - ./pytest.ini:/opt/voronoi/pytest.ini
+      - ./pyproject.toml:/opt/voronoi/pyproject.toml
       - ./README.md:/opt/voronoi/README.md
-      - ./requirements-setup.txt:/opt/voronoi/requirements-setup.txt
-      - ./requirements-tests.txt:/opt/voronoi/requirements-tests.txt
-      - ./requirements.txt:/opt/voronoi/requirements.txt
       - ./setup.py:/opt/voronoi/setup.py
-      - ./src/:/opt/voronoi/src/
-      - ./tests/:/opt/voronoi/tests/
+      - ./src:/opt/voronoi/src
+      - ./tests:/opt/voronoi/tests
+      - ./voronoi:/opt/voronoi/voronoi
     entrypoint: pytest
diff --git a/docker-compose.pypy.yml b/docker-compose.pypy.yml
@@ -9,12 +9,9 @@ services:
         - IMAGE_VERSION=${PYPY_IMAGE_VERSION}
     image: lycantropos/voronoi-pypy:0.3.1
     volumes:
-      - ./voronoi/:/opt/voronoi/voronoi/
-      - ./pytest.ini:/opt/voronoi/pytest.ini
+      - ./pyproject.toml:/opt/voronoi/pyproject.toml
       - ./README.md:/opt/voronoi/README.md
-      - ./requirements-setup.txt:/opt/voronoi/requirements-setup.txt
-      - ./requirements-tests.txt:/opt/voronoi/requirements-tests.txt
-      - ./requirements.txt:/opt/voronoi/requirements.txt
       - ./setup.py:/opt/voronoi/setup.py
-      - ./tests/:/opt/voronoi/tests/
+      - ./tests:/opt/voronoi/tests
+      - ./voronoi:/opt/voronoi/voronoi
     entrypoint: pytest