From 7650468b5fbb2186f50e894504a7b997d5eae893 Mon Sep 17 00:00:00 2001 From: Stephan Barth Date: Mon, 11 Nov 2024 15:04:22 +0100 Subject: [PATCH 1/3] build(docker/backend/Dockerfile): Added missing "make .job-start" --- docker/backend/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index bd6ef7bab..999c83c8c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -21,6 +21,8 @@ ENV STACK_ROOT="${PROJECT_DIR}/.stack" WORKDIR "${PROJECT_DIR}/.job-${JOB}" ENV HOME="${PROJECT_DIR}/.job-${JOB}" RUN make -- --dependencies-backend STACK_ROOT=${STACK_ROOT} IN_CONTAINER=true JOB=${JOB} + +RUN cd "${PROJECT_DIR}" && make .job-start RUN cd "${PROJECT_DIR}/.job-start" && STACK_ROOT=${STACK_ROOT} stack install yesod-bin ENV FRADRIVE_MAKE_TARGET=--start-backend From 024d29fba8919cf7e643c24ebf36501d58bbf557 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 11 Nov 2024 16:44:15 +0100 Subject: [PATCH 2/3] build(backend): remove uniworxdev binary --- package.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package.yaml b/package.yaml index c46471367..ec3c48e85 100644 --- a/package.yaml +++ b/package.yaml @@ -295,17 +295,17 @@ executables: when: - condition: flag(library-only) buildable: false - - condition: flag(dev) - buildable: false +# - condition: flag(dev) +# buildable: false ghc-options: - -threaded -rtsopts "-with-rtsopts=-N -T" - uniworxdev: - <<: *uniworxexe - when: - - condition: flag(library-only) - buildable: false - - condition: "!flag(dev)" - buildable: false +# uniworxdev: +# <<: *uniworxexe +# when: +# - condition: flag(library-only) +# buildable: false +# - condition: "!flag(dev)" +# buildable: false uniworxdb: main: Database.hs ghc-options: From f92ae96eb289d378cf03128fac555c8fb5dcf9ad Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 11 Nov 2024 16:45:06 +0100 Subject: [PATCH 3/3] build(Makefile): do not compile backend before starting yesod-devel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d253ee54b..1ef34a0ed 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,7 @@ endif fi # HELP(start-backend): start yesod-devel instance ---start-backend: --compile-backend +--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` ; \