From 9b21fcb6e3245244d8933a11901cc2957226730b Mon Sep 17 00:00:00 2001
From: HgO <hgo@batato.be>
Date: Mon, 8 Aug 2022 22:28:58 +0200
Subject: [PATCH] include tests in dockerfile

---
 .dockerignore     |  4 ++++
 docker/Dockerfile | 32 +++++++++++++++++---------------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 913ec0d..271e3cc 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -8,9 +8,13 @@ env3/
 .env/
 .venv/
 
+# Git
+.git
+
 # Python
 __pycache__/
 *.egg-info/
+.mypy_cache
 build/
 dist/
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index b08adb2..9dd5330 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -23,7 +23,7 @@
 # then transfer those dependencies to the container we're going to ship,
 # before throwing this one away
 ARG PYTHON_VERSION=3.10
-FROM docker.io/python:${PYTHON_VERSION}-alpine as builder
+FROM python:${PYTHON_VERSION}-alpine as builder
 
 ##
 ## Build libolm for matrix-nio e2e support
@@ -41,22 +41,20 @@ RUN apk add --no-cache \
     yaml-dev \
     python3-dev
 
-ENV VIRTUAL_ENV="/opt/matrix_alertbot"
+ENV PROJECT_DIR="/opt/matrix_alertbot"
+ENV LIBOLM_SRC_DIR="/opt/olm"
+ENV VIRTUAL_ENV="${PROJECT_DIR}/.venv"
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-RUN python -m venv $VIRTUAL_ENV
+RUN python -m venv "${VIRTUAL_ENV}"
 
-WORKDIR "${VIRTUAL_ENV}"
+WORKDIR "${PROJECT_DIR}"
 # Build libolm
 #
 # Also build the libolm python bindings and place them at /python-libs
 # We will later copy contents from both of these folders to the runtime
 # container
 COPY docker/build_and_install_libolm.sh /scripts/
-RUN /scripts/build_and_install_libolm.sh "${LIBOLM_VERSION}" "${VIRTUAL_ENV}"
-
-# Install Postgres dependencies
-RUN apk add --no-cache \
-    musl-dev
+RUN /scripts/build_and_install_libolm.sh "${LIBOLM_VERSION}" "${LIBOLM_SRC_DIR}}"
 
 # Install python runtime modules. We do this before copying the source code
 # such that these dependencies can be cached
@@ -70,33 +68,37 @@ COPY setup.py ./setup.py
 RUN pip install --no-warn-script-location ".[e2e]"
 
 # Now copy the source code
-COPY *.py *.md *.in ./
+COPY *.py *.md *.in requirements.txt ./
 COPY matrix_alertbot/*.py ./matrix_alertbot/
 COPY matrix_alertbot/resources ./matrix_alertbot/resources
 
 # And build the final module
 RUN pip install --no-warn-script-location ".[e2e]"
 
+COPY tests ./tests
+
 ##
 ## Creating the runtime container
 ##
 
 # Create the container we'll actually ship. We need to copy libolm and any
 # python dependencies that we built above to this container
-FROM docker.io/python:${PYTHON_VERSION}-alpine
+FROM python:${PYTHON_VERSION}-alpine
 
-ENV VIRTUAL_ENV="/opt/matrix_alertbot"
+ENV PROJECT_DIR="/opt/matrix_alertbot"
+ENV VIRTUAL_ENV="${PROJECT_DIR}/.venv"
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
+WORKDIR "${PROJECT_DIR}"
+
 # Copy python dependencies from the "builder" container
-COPY --from=builder /opt/matrix_alertbot /opt/matrix_alertbot
+COPY --from=builder "${PROJECT_DIR}" "${PROJECT_DIR}"
 
 # Copy libolm from the "builder" container
 COPY --from=builder /usr/local/lib/libolm* /usr/local/lib/
 
 # Install any native runtime dependencies
-RUN apk add --no-cache \
-    libstdc++
+RUN apk add --no-cache libstdc++
 
 # Specify a volume that holds the config file, SQLite3 database,
 # and the matrix-nio store