Split into two images: 'run' and 'test'.

Author: jeffwright13

Dockerfile

@@ -1,23 +1,52 @@
-##########################################
-FROM jrottenberg/ffmpeg:3.2-ubuntu AS base
-##########################################
-RUN apt-get update && apt-get install -y python3.8 pip git
+###########################################
+FROM jrottenberg/ffmpeg:4.1-ubuntu AS base
+###########################################
+ENV PYTHONDONTWRITEBYTECODE=1 \
+    PYTHONUNBUFFERED=1 \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    POETRY_NO_INTERACTION=1
 
-#################
+RUN apt-get update && \
+    apt-get install -y python3.8 pip git && \
+    apt-get install --no-install-recommends -y curl build-essential && \
+    apt-get clean
+
+##################
 FROM base AS apg
-#################
-ARG APG_DIR=/audio_program_generator/
+##################
 WORKDIR /
-COPY ./entry.sh entry.sh
-
 RUN mkdir /apg && \
-    git clone https://github.com/jeffwright13/audio_program_generator.git && \
-    pip install poetry && \
-    cd $APG_DIR && \
-    poetry install --no-dev
+    git clone https://github.com/jeffwright13/audio_program_generator.git
+
+###################
+FROM apg AS poetry
+###################
+ARG APG_SRC_DIR=/audio_program_generator
+WORKDIR $APG_SRC_DIR
+RUN pip install --no-cache-dir poetry
 
 ###################
-FROM apg AS runtime
+FROM poetry AS run
 ###################
+ARG APG_SRC_DIR=/audio_program_generator
+WORKDIR $APG_SRC_DIR
+COPY ./entry-run.sh entry-run.sh
+RUN cd $APG_SRC_DIR && \
+    poetry install --no-interaction --no-dev
+
+ENTRYPOINT ["/bin/bash"]
+CMD ["/audio_program_generator/entry-run.sh"]
+
+####################
+FROM poetry AS test
+####################
+ARG APG_SRC_DIR=/audio_program_generator
+COPY ./entry-test.sh ./entry-test.sh
+RUN cd $APG_SRC_DIR && \
+    poetry install --no-interaction
+RUN ln -s $(poetry env info --path) /var/my-venv
+RUN echo 'source /var/my-venv/bin/activate' >> ~/.bashrc
+
 ENTRYPOINT ["/bin/bash"]
-CMD ["/entry.sh"]
+CMD ["/audio_program_generator/entry-test.sh"]

Makefile

@@ -1,5 +1,13 @@
 DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
-build:
-	docker build --tag apg .
+
+build-all:	build-run build-test
+
+build-run:
+	docker build --target run --tag apg-run .
 run:
-	docker run --rm -it -v "$(DIR)"/apgfiles:/audio_program_generator/apgfiles apg
+	docker run --rm -it -v $(DIR)/apgfiles:/audio_program_generator/apgfiles apg-run
+
+build-test:
+	docker build --target test --tag apg-test .
+test:
+	docker run --rm -it -v $(DIR)/apgfiles:/audio_program_generator/apgfiles apg-test

apg-shell.sh

@@ -2,7 +2,8 @@
 export VIRTUAL_ENV_DISABLE_PROMPT=1
 cd /audio_program_generator || exit
 echo --------------------------------------
-echo Type  apg  to create an audio program.
-echo Type  exit  to quit.
+echo Type 'apg' to create an audio program.
+echo Type 'exit' to quit.
 echo --------------------------------------
+source ~/.bashrc
 poetry shell

entry.sh renamed to entry-run.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+set +x
+export VIRTUAL_ENV_DISABLE_PROMPT=1
+cd /audio_program_generator || exit
+echo --------------------------------------
+echo Running tests...
+echo --------------------------------------
+source /var/my-venv/bin/activate
+pytest -v --html=tests/results/report.html --self-contained-html