From 4f6f48be619073c17751f88d6d7f509b63ee410a Mon Sep 17 00:00:00 2001
From: Jarkko Jaakola <jarkko.jaakola@aiven.io>
Date: Thu, 26 Sep 2024 14:05:38 +0300
Subject: [PATCH] chore: call make install before docker build

---
 .dockerignore                              | 1 +
 .github/workflows/container-smoke-test.yml | 7 ++-----
 container/Dockerfile                       | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 3543f6939..f6882f135 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,6 +7,7 @@
 !src
 !requirements/*.txt
 !README.rst
+!LICENSE
 !pyproject.toml
 !container/start.sh
 !container/healthcheck.py
diff --git a/.github/workflows/container-smoke-test.yml b/.github/workflows/container-smoke-test.yml
index 93c34decf..9d8a5cd06 100644
--- a/.github/workflows/container-smoke-test.yml
+++ b/.github/workflows/container-smoke-test.yml
@@ -18,10 +18,7 @@ jobs:
           fetch-depth: 0
 
       - name: Install requirements
-        run: |
-          python -m venv venv
-          source ./venv/bin/activate
-          pip install .
+        run: make install
 
       - name: Resolve Karapace version
         run: |
@@ -33,7 +30,7 @@ jobs:
         run: docker build --build-arg KARAPACE_VERSION=${{ env.KARAPACE_VERSION }} --file=container/Dockerfile .
 
       - name: Run container
-        run: docker compose --file=container/compose.yml up --build --wait --detach
+        run: docker-compose --file=container/compose.yml up --build
 
       - name: Smoke test registry
         run: bin/smoke-test-registry.sh
diff --git a/container/Dockerfile b/container/Dockerfile
index 2e1544319..77f6c5865 100644
--- a/container/Dockerfile
+++ b/container/Dockerfile
@@ -33,7 +33,7 @@ RUN --mount=type=cache,target=/root/.cache/pip \
     else \
         PRETEND_VERSION=$KARAPACE_VERSION; \
     fi; \
-    SETUPTOOLS_SCM_PRETEND_VERSION=$PRETEND_VERSION python3 -m pip install --no-deps .
+    SETUPTOOLS_SCM_PRETEND_VERSION=$PRETEND_VERSION python3 -m pip install -v --no-deps .
 
 # Karapace image, i.e. production.
 FROM python:3.10.11-slim-bullseye AS karapace