Fix Docker container to include jsoo, which is now needed

Author: AltGr

Dockerfile

@@ -71,6 +71,14 @@ ARG opam_switch="/home/opam/.opam/4.12"
 COPY --from=compilation /home/opam/install-prefix /usr
 COPY --from=compilation "$opam_switch/bin"/ocaml* "$opam_switch/bin/"
 COPY --from=compilation "$opam_switch/lib/ocaml" "$opam_switch/lib/ocaml/"
+COPY --from=compilation "$opam_switch/bin/js_of_ocaml" "$opam_switch/bin/"
+COPY --from=compilation "$opam_switch/lib/js_of_ocaml" "$opam_switch/lib/js_of_ocaml"
+
+# Fixes for ocamlfind
+COPY --from=compilation "$opam_switch/lib/findlib.conf" "$opam_switch/lib/"
+COPY --from=compilation "$opam_switch/lib/stdlib" "$opam_switch/lib/stdlib"
+ENV PATH="${opam_switch}/bin:${PATH}"
+ENV OCAMLPATH="/usr/lib"
 
 ENTRYPOINT ["dumb-init","/usr/bin/learn-ocaml","--sync-dir=/sync","--repo=/repository"]
 CMD ["build","serve"]

Makefile

@@ -69,7 +69,7 @@ docker-images: Dockerfile learn-ocaml.opam
 	@docker build -t learn-ocaml-compilation --target compilation docker
 	@docker build -t learn-ocaml --target program docker
 	@docker build -t learn-ocaml-client --target client docker
-	@echo "Use with 'docker run --rm -v \$$PWD/sync:/sync -v \$$PWD:/repository -p PORT:8080 learn-ocaml -- ARGS'"
+	@echo "Use with 'docker run --rm -v learn-ocaml-sync:/sync -v \$$PWD:/repository -p PORT:8080 learn-ocaml -- ARGS'"
 
 VERSION = $(shell opam show ./learn-ocaml.opam -f version)