Merge remote-tracking branch 'origin/145-build-system-rewrite' into fradrive/merge-jost-new-build

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` ; \

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

package.yaml

@@ -295,17 +295,17 @@ executables:
     when:
       - condition: flag(library-only)
         buildable: false
-      - condition: flag(dev)
+#      - condition: flag(dev)
-        buildable: false
+#        buildable: false
     ghc-options:
       - -threaded -rtsopts "-with-rtsopts=-N -T"
-  uniworxdev:
+#  uniworxdev:
-    <<: *uniworxexe
+#    <<: *uniworxexe
-    when:
+#    when:
-      - condition: flag(library-only)
+#      - condition: flag(library-only)
-        buildable: false
+#        buildable: false
-      - condition: "!flag(dev)"
+#      - condition: "!flag(dev)"
-        buildable: false
+#        buildable: false
   uniworxdb:
     main: Database.hs
     ghc-options: