Split Dockerfile into 2 images: cacher and cacher-tests

AlmaLinux · Apr 8, 2024 · e643a0d · e643a0d
1 parent aef1bfe
commit e643a0d
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 13 deletions.
diff --git a/.github/workflows/preflight.yml b/.github/workflows/preflight.yml
@@ -51,6 +51,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          target: cacher-tests
           load: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -73,7 +74,7 @@ jobs:
 
       - name: Run pytest
         run: |
-          docker compose run --rm cacher bash -c "
+          docker compose run --rm cacher_tests bash -c "
             pytest -v --cov \
               --junit-xml=$REPORTS_DIR/pytest-report.xml \
               --cov-report=xml:$REPORTS_DIR/pytest-coverage.xml \
@@ -82,28 +83,28 @@ jobs:
       - name: Run pylint
         if: ${{ steps.changed-files.outputs.src == 'true' }}
         run: |
-          docker compose run --rm cacher bash -c "
+          docker compose run --rm cacher_tests bash -c "
             pylint --exit-zero ${{ steps.changed-files.outputs.src_files }} \
               | tee $REPORTS_DIR/pylint-report.txt"
 
       - name: Run black
         if: ${{ steps.changed-files.outputs.py == 'true' }}
         run: |
-          docker compose run --rm cacher bash -c "
+          docker compose run --rm cacher_tests bash -c "
             black --check --diff --color ${{ steps.changed-files.outputs.py_files }} \
               | tee >(sed 's/\x1B\[[0-9;]*m//g' > $REPORTS_DIR/black-report.txt)"
 
       - name: Run isort
         if: ${{ steps.changed-files.outputs.py == 'true' }}
         run: |
-          docker compose run --rm cacher bash -c "
+          docker compose run --rm cacher_tests bash -c "
             isort --check-only --diff --color ${{ steps.changed-files.outputs.py_files }} \
               | tee >(sed 's/\x1B\[[0-9;]*m//g' > $REPORTS_DIR/isort-report.txt)"
 
       - name: Run bandit
         if: ${{ steps.changed-files.outputs.src == 'true' }}
         run: |
-          docker compose run --rm cacher bash -c "
+          docker compose run --rm cacher_tests bash -c "
             bandit -c pyproject.toml ${{ steps.changed-files.outputs.src_files }} \
               | tee >(sed 's/\x1B\[[0-9;]*m//g' > $REPORTS_DIR/bandit-report.txt)"
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -28,6 +28,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
+          target: cacher-tests
           load: true
           cache-from: type=gha
           cache-to: type=gha,mode=max
@@ -38,7 +39,7 @@ jobs:
       - name: Run pytest
         id: pytest
         run: |
-          docker compose run --rm cacher bash -c "
+          docker compose run --rm cacher_tests bash -c "
             pytest -v --cov \
               --cov-report=json:$REPORTS_DIR/pytest-report.json \
               --cov-report=term | tee $REPORTS_DIR/pytest-output.txt"

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM almalinux:9
+FROM almalinux:9 as cacher
 
 RUN <<EOT
   set -ex
@@ -15,12 +15,22 @@ RUN <<EOT
 EOT
 
 WORKDIR /code
-COPY requirements.* .
+COPY requirements.txt .
 RUN <<EOT
   set -ex
   python3 -m ensurepip
-  pip3 install -r requirements.devel.txt
-  rm requirements.*
+  pip3 install -r requirements.txt
+  rm requirements.txt
 EOT
 
 ADD --chmod=755 https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh /
+
+
+FROM cacher as cacher-tests
+
+COPY requirements-tests.txt .
+RUN <<EOT
+  set -ex
+  pip3 install -r requirements-tests.txt
+  rm requirements-tests.txt
+EOT
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,6 +3,15 @@ services:
     image: alma-tests-cacher:latest
     build:
       context: .
+      target: cacher
     command: "python3 alma_tests_cacher.py"
     volumes:
       - ".:/code"
+
+  cacher_tests:
+    image: alma-tests-cacher-tests:latest
+    build:
+      context: .
+      target: cacher-tests
+    volumes:
+      - ".:/code"
diff --git a/requirements.devel.txt → requirements-tests.txt b/requirements.devel.txt → requirements-tests.txt
@@ -1,5 +1,3 @@
--r requirements.txt
-
 anyio==4.3.0
 
 pytest==8.1.1

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-aiohttp==3.9.1
+aiohttp==3.9.3
 pydantic==2.5.3
 pydantic-settings==2.1.0
 sentry-sdk==1.39.1