From e38e22a064806dc58261600b5ddc5fe4bae6442d Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 28 Mar 2025 17:30:45 +0100 Subject: [PATCH] build(backend/Dockerfile): fix backend Dockerfile ENTRYPOINT --- Makefile | 2 +- backend/Dockerfile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index db8df3c86..9b28bf181 100644 --- a/Makefile +++ b/Makefile @@ -82,7 +82,7 @@ start-%: .PHONY: shell-% # HELP(shell-$SERVICE): launch a (bash) shell inside a given service shell-%: - docker compose run --build --no-deps --entrypoint="$(ENTRYPOINT)" $* + docker compose run --build --no-deps $* $(ENTRYPOINT) .PHONY: ghci # HELP: launch ghci instance. Use in combination with SRC to specify the modules to be loaded by ghci: make ghci SRC=src/SomeModule.hs ghci: ENTRYPOINT=stack ghci $(SRC) diff --git a/backend/Dockerfile b/backend/Dockerfile index 7b8069f2f..89c66aa83 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -33,8 +33,4 @@ ENV PROJECT_DIR=${PROJECT_DIR} # RUN mkdir -p "${PROJECT_DIR}"; chmod -R 777 "${PROJECT_DIR}" WORKDIR ${PROJECT_DIR} ENV HOME=${PROJECT_DIR} -ENV STACK_ROOT="${PROJECT_DIR}/.stack" - -ENV STACK_SRC="" -ENV STACK_ENTRY="ghci ${STACK_SRC}" -ENTRYPOINT stack ${STACK_ENTRY} \ No newline at end of file +ENV STACK_ROOT="${PROJECT_DIR}/.stack" \ No newline at end of file