Refactored DOckerfile and Makefile to improve execution experience.

Dockerfile

@@ -26,21 +26,19 @@ ARG APG_SRC_DIR=/audio_program_generator
 WORKDIR $APG_SRC_DIR
 RUN pip install --no-cache-dir poetry
 
-###################
-FROM poetry AS run
-###################
+######################
+FROM poetry AS apg-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"]
+COPY pyproject.toml ./
+COPY poetry.lock ./
+RUN poetry install --no-interaction --no-dev
+ENTRYPOINT ["/bin/bash", "-c", "poetry run apg \"$@\"", "--"]
 
-####################
-FROM poetry AS test
-####################
+#######################
+FROM poetry AS apg-test
+#######################
 ARG APG_SRC_DIR=/audio_program_generator
 COPY ./entry-test.sh ./entry-test.sh
 RUN cd $APG_SRC_DIR && \

Makefile

@@ -1,13 +1,20 @@
 DIR:=$(strip $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))))
+NAME:=$(shell grep -e "^name\s*=\s*" pyproject.toml | cut -d = -f 2 | xargs)
+VERSION:=$(shell grep -e "^version\s*=\s*" pyproject.toml | cut -d = -f 2 | xargs)
 
-build-all:	build-run build-test
+apg-build:
+	docker build --target apg-run --tag $(NAME):$(VERSION) .
 
-build-run:
-	docker build --target run --tag apg-run .
-run:
-	docker run --rm -it -v $(DIR)/apgfiles:/audio_program_generator/apgfiles apg-run
+apg:
+	docker run --rm -it -v $(DIR)/apgfiles:/audio_program_generator/apgfiles $(NAME):$(VERSION) ${args}
+
+apg-build-test:
+	docker build --target apg-test --tag apg-test:$(VERSION) .
 
-build-test:
-	docker build --target test --tag apg-test .
 test:
-	docker run --rm -it -v $(DIR)/apgfiles:/audio_program_generator/apgfiles apg-test
+	docker run --rm -it -v $(DIR)/apgfiles:/audio_program_generator/apgfiles apg-test:$(VERSION)
+
+.PHONY : clean
+clean:
+	docker container rm -f $(NAME):$(VERSION)
+	docker image rm -f $(NAME):$(VERSION)