Fix 'Docker' configurations

lycantropos · May 14, 2023 · 1781dd2 · 1781dd2
1 parent 6468019
commit 1781dd2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,18 +3,12 @@ ARG IMAGE_VERSION
 
 FROM ${IMAGE_NAME}:${IMAGE_VERSION}
 
-RUN pip install --upgrade pip setuptools
-
 WORKDIR /opt/sect
 
-COPY requirements.txt .
-RUN pip install -r requirements.txt
-
-COPY requirements-tests.txt .
-RUN pip install -r requirements-tests.txt
-
+COPY pyproject.toml .
 COPY README.md .
-COPY pytest.ini .
 COPY setup.py .
 COPY sect sect
 COPY tests tests
+
+RUN pip install -e .[tests]
diff --git a/docker-compose.cpython.yml b/docker-compose.cpython.yml
@@ -9,10 +9,8 @@ services:
         - IMAGE_VERSION=${CPYTHON_IMAGE_VERSION}
     image: lycantropos/sect-cpython:6.1.0
     volumes:
-      - ./pytest.ini:/opt/sect/pytest.ini
+      - ./pyproject.toml:/opt/sect/pyproject.toml
       - ./README.md:/opt/sect/README.md
-      - ./requirements-tests.txt:/opt/sect/requirements-tests.txt
-      - ./requirements.txt:/opt/sect/requirements.txt
       - ./sect:/opt/sect/sect
       - ./setup.py:/opt/sect/setup.py
       - ./tests:/opt/sect/tests

diff --git a/docker-compose.pypy.yml b/docker-compose.pypy.yml
@@ -9,10 +9,8 @@ services:
         - IMAGE_VERSION=${PYPY_IMAGE_VERSION}
     image: lycantropos/sect-pypy:6.1.0
     volumes:
-      - ./pytest.ini:/opt/sect/pytest.ini
+      - ./pyproject.toml:/opt/sect/pyproject.toml
       - ./README.md:/opt/sect/README.md
-      - ./requirements-tests.txt:/opt/sect/requirements-tests.txt
-      - ./requirements.txt:/opt/sect/requirements.txt
       - ./sect:/opt/sect/sect
       - ./setup.py:/opt/sect/setup.py
       - ./tests:/opt/sect/tests