Clean up DockerFile (#37)

* Add .env to .gitignore file

* Update precommit with hook that auto adds ticket from branch name

* Update pre commit config so things are install into the correct stages

* Update docker to use pipx rather than a curl command

* Update the docker file to utilize pipx and an up to date version of poetry

* Fix comments in Dockerfile

---------

Co-authored-by: JP Hanna <[email protected]>

.gitignore

@@ -5,3 +5,4 @@ logs/
 coverage.xml
 local.env
 docker-compose.override.yml
+.env

.pre-commit-config.yaml

@@ -1,3 +1,8 @@
+default_install_hook_types:
+  - pre-commit
+  - commit-msg
+default_stages:
+  - pre-commit
 repos:
   - repo: local
     hooks:
@@ -60,3 +65,10 @@ repos:
         types: [ python ]
         exclude: alembic|test_.*|conftest.py
         args: [ -c, pyproject.toml ]
+
+  - repo: https://github.com/milin/giticket
+    rev: v1.4
+    hooks:
+      - id: giticket
+        stages:
+          - commit-msg

Dockerfile

@@ -1,20 +1,31 @@
-FROM python:3.11.4 as base
+FROM python:3.11.4-slim as base
 MAINTAINER JP Hanna "[email protected]"
 WORKDIR /app/
 COPY . /app/
 
 FROM base as install-poetry
-ENV POETRY_VIRTUALENVS_CREATE=false \
-    POETRY_VERSION=1.5.1
-RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# Set env variables
+ENV PIPX_BIN_DIR="/opt/pipx" \
+    POETRY_NO_INTERACTION=true \
+    POETRY_VIRTUALENVS_CREATE=false \
+    POETRY_VIRTUALENVS_IN_PROJECT=false \
+    POETRY_CACHE_DIR="/opt/poetry" \
+    POETRY_VERSION=1.7.0 \
+    PATH="/root/.local/share/pipx/venvs/poetry/bin:$PATH"
+ENV PATH="$POETRY_VIRTUALENVS_PATH/bin:$PIPX_BIN_DIR:$PATH"
+
+# Install poetry
+RUN pip install --upgrade pip \
+    && pip install pipx \
+    && pipx install poetry==$POETRY_VERSION
 RUN apt-get update && apt-get install -y --no-install-recommends gcc
-ENV PATH "/root/.local/bin:$PATH"
 
-# Install python dependencies in /.venv
-RUN poetry install --no-root --no-ansi --no-interaction --only=main
+# Install python dependencies
+RUN poetry install --no-root --no-ansi --no-interaction --only=main --no-directory
 
 # Install application into container
-ENV PYTHONPATH "{$PYTHONPATH}:/app/"
+ENV PYTHONPATH "$PYTHONPATH:/app/"
 
 FROM install-poetry as install-dev
-RUN poetry install --no-root --no-ansi --no-interaction --only=dev
+RUN poetry install --no-root --no-ansi --no-interaction --only=dev --no-directory