Updated docker build (#13)

* Fix package install part of docker build
* Add setuptools, since its a dependency

Dockerfile

@@ -1,7 +1,8 @@
 FROM python:3.10-slim
 
 ENV APP_DIR=/virtual_library_card/ \
-    DJANGO_SETTINGS_MODULE=virtual_library_card.settings.prod
+    DJANGO_SETTINGS_MODULE=virtual_library_card.settings.prod \
+    POETRY_VIRTUALENVS_CREATE=false
 
 ENV UWSGI_MASTER=1 \
     UWSGI_HTTP_AUTO_CHUNKED=1 \
@@ -22,29 +23,38 @@ ENV UWSGI_MASTER=1 \
     UWSGI_LOGFORMAT="[pid: %(pid)|app: -|req: -/-] %(addr) (%(user)) {%(vars) vars in %(pktsize) bytes} [%(ctime)] %(method) %(clean_uri) => generated %(rsize) bytes in %(msecs) msecs (%(proto) %(status)) %(headers) headers in %(hsize) bytes (%(switches) switches on core %(core))"
 
 ARG POETRY_VERSION=1.7.1
+ARG REPO=ThePalaceProject/virtual-library-card
 
 # Install system
 RUN apt-get update -y && \
     apt-get install --no-install-recommends -y \
     curl mime-support && \
     curl -sSL https://install.python-poetry.org | POETRY_HOME="/opt/poetry" python3 - --yes --version "$POETRY_VERSION" && \
     ln -s /opt/poetry/bin/poetry /bin/poetry && \
-    apt-get remove curl -y && \
     apt-get autoremove -y && \
     rm -Rf /var/lib/apt/lists/* && \
     rm -Rf /root/.cache && \
     find /opt /usr -type d -name "__pycache__" -exec rm -rf {} +
 
-# Install Python dependencies
-COPY pyproject.toml poetry.lock $APP_DIR
 WORKDIR $APP_DIR
-RUN POETRY_VIRTUALENVS_CREATE=false poetry install --only main --no-interaction && \
+
+# Do basic python dependency install
+# We use curl here to grab our poetry.lock and pyproject.toml files from the repo
+# so that we can cache the docker layer for the poetry install step.
+# If these files change, the later poetry install will handle it.
+RUN curl -fsSL https://raw.githubusercontent.com/${REPO}/main/pyproject.toml -o ${APP_DIR}pyproject.toml && \
+    curl -fsSL https://raw.githubusercontent.com/${REPO}/main/poetry.lock -o ${APP_DIR}poetry.lock && \
+     poetry install --sync --only main --no-root --no-interaction && \
     poetry cache clear -n --all pypi && \
     rm -Rf /root/.cache && \
     find /opt /usr -type d -name "__pycache__" -exec rm -rf {} +
 
-# Install code
+# Do final poetry install, when the layers are cached, this is the only step that will run
 COPY . $APP_DIR
+RUN POETRY_VIRTUALENVS_CREATE=false poetry install --sync --only main --no-interaction && \
+    poetry cache clear -n --all pypi && \
+    rm -Rf /root/.cache && \
+    find /opt /usr -type d -name "__pycache__" -exec rm -rf {} +
 
 EXPOSE 8000
 

pyproject.toml

@@ -24,6 +24,10 @@ description = "Virtual Library Card Creator"
 homepage = "https://thepalaceproject.org"
 license = "Apache-2.0"
 name = "Virtual Library Card"
+packages = [
+    {include = "virtual_library_card"},
+    {include = "virtuallibrarycard"},
+]
 readme = "README.md"
 repository = "https://github.com/ThePalaceProject/virtual-library-card"
 version = "0"  # Version number is managed with tags in git
@@ -62,6 +66,7 @@ python-stdnum = "1.19"
 pytz = "^2023.2"
 pyuwsgi = ">=2.0,<2.1"
 requests = "^2.31"
+setuptools = "^69.1.0"
 
 [tool.poetry.group.ci.dependencies]
 dunamai = "^1.16"