experiment with removing poetry bundle

Dockerfile

@@ -9,34 +9,21 @@ WORKDIR /src
 COPY package.json .
 RUN npm install
 
-
-# poetry
-FROM python:3.12-slim AS poetry-packages
-
-RUN apt-get update && apt-get install --yes build-essential > /dev/null
-
-RUN pip install poetry poetry-plugin-bundle
-
-WORKDIR /src
-
-COPY pyproject.toml .
-COPY poetry.lock .
-
-# do this so that poetry bundle can run without the project - can't pass --no-root to bundle
-RUN touch README.md
-
-RUN poetry bundle venv ./venv
-
-
 # app
 FROM python:3.12-slim
 
-RUN apt-get update && apt-get install --yes libpq-dev > /dev/null
+RUN apt-get update && apt-get install --yes libpq-dev build-essential > /dev/null
 
 WORKDIR /usr/src/app
 
 COPY --from=npm-packages /src/node_modules ./node_modules
-COPY --from=poetry-packages /src/venv ./venv
+
+COPY pyproject.toml .
+COPY poetry.lock .
+COPY README.md .
+
+RUN pip install poetry
+RUN poetry install
 
 COPY . .
 

Makefile

@@ -102,7 +102,7 @@ docker_shell: ## Run the docker container
 
 .PHONY: docker_test
 docker_test: ## Run the tests in the docker container
-	docker run -e DATABASE_URL=psql://consultations_test:@host.docker.internal:5432/consultations_test $(IMAGE) ./venv/bin/pytest
+	docker run -e DATABASE_URL=psql://consultations_test:@host.docker.internal:5432/consultations_test $(IMAGE) poetry run pytest tests/
 
 .PHONY: docker_login
 docker_login:

README.md

@@ -116,3 +116,4 @@ Then
 ```
 npm run dev
 ```
+

start.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 
-venv/bin/django-admin migrate
-venv/bin/django-admin compress --force --engine jinja2
-exec venv/bin/gunicorn -c ./consultation_analyser/gunicorn.py consultation_analyser.wsgi
+poetry run django-admin migrate
+poetry run django-admin compress --force --engine jinja2
+exec poetry run gunicorn -c ./consultation_analyser/gunicorn.py consultation_analyser.wsgi