From c3117dbdcd1de9ef9f0751afa45018e2ebce2c42 Mon Sep 17 00:00:00 2001 From: Steffen Jost Date: Mon, 2 Dec 2024 17:38:59 +0100 Subject: [PATCH] fix(ghci): ghci works now as expected --- Makefile | 8 +++++--- docker/backend/Dockerfile | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cfe1c5776..cd008f20f 100644 --- a/Makefile +++ b/Makefile @@ -255,11 +255,13 @@ endif $(CONTAINER_COMMAND) attach $${CONTAINER_ID} || : ; \ fi +# For Reverse Proxy Problem see: https://groups.google.com/g/yesodweb/c/2EO53kSOuy0/m/Lw6tq2VYat4J + # HELP(start-backend): start development instance --start-backend: export DEV_PORT_HTTP=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTP=' | sed 's/DEV_PORT_HTTP=//'`; \ export DEV_PORT_HTTPS=`cat $(CONTAINER_FILE) | grep 'DEV_PORT_HTTPS=' | sed 's/DEV_PORT_HTTPS=//'`; \ - export HOST=`hostname -s` ; \ + export HOST=127.0.0.1 ; \ export PORT=$${PORT:-$${DEV_PORT_HTTP}} ; \ export DETAILED_LOGGING=$${DETAILED_LOGGING:-true} ; \ export LOG_ALL=$${LOG_ALL:-false} ; \ @@ -273,7 +275,7 @@ endif export RIBBON=$${RIBBON:-$${HOST:-localhost}} ; \ export APPROOT=$${APPROOT:-http://localhost:$${DEV_PORT_HTTP}} ; \ export AVSPASS=$${AVSPASS:-nopasswordset} ; \ - stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" + stack $(STACK_CORES) exec --local-bin-path $$(pwd)/bin --copy-bins -- yesod devel -n -p "$${DEV_PORT_HTTP}" -q "$${DEV_PORT_HTTPS}" # HELP(compile-backend): compile backend binaries --compile-backend: stack build $(STACK_CORES) --fast --profile --library-profiling --executable-profiling --flag uniworx:-library-only $(--DEVELOPMENT) --local-bin-path $$(pwd)/bin --copy-bins @@ -317,7 +319,7 @@ well-known: static; ./bin/uniworxdb $(UNIWORXDB_OPTS) --shell-ghci: - stack exec -- ghci $(SRC) + stack ghci -- $(SRC) # --main-is uniworx:exe:uniworx # HELP(shell-{backend,frontend,memcached,minio,postgres}): enter (bash) shell inside a new container of a given service diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 64872a038..e2629549c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,7 +1,7 @@ -FROM devfra.azurecr.io/de.fraport.build/tools:1.1.0 +FROM docker.io/ubuntu:latest # debug info -RUN lsb_release -a +# RUN lsb_release -a # RUN curl -k https://google.de RUN env # RUN curl -sSLk -x $HTTP_PROXY