Merge pull request #48 from tmcgilchrist/really_version

Use dune install to add version information to executables.

Author: tmcgilchrist

Dockerfile

@@ -36,13 +36,15 @@ RUN opam pin add -yn current_docker.dev "./ocurrent" && \
 
 RUN opam install -y --deps-only .
 ADD --chown=opam . .
-RUN opam exec -- dune subst
-RUN opam exec -- dune build ./_build/install/default/bin/solver-service
-RUN opam exec -- dune build ./_build/install/default/bin/solver-worker
+RUN opam config exec -- dune build -p solver-service,solver-service-api,solver-worker @install
+RUN opam config exec -- dune install --prefix=/usr/local --destdir=pkg --section=bin --relocatable solver-worker solver-service
 
 FROM ubuntu:22.04
 RUN apt-get update && apt-get install docker.io libev4 curl gnupg2 git libsqlite3-dev ca-certificates netbase -y --no-install-recommends
 WORKDIR /var/lib/ocluster-worker
 ENTRYPOINT ["/usr/local/bin/solver-worker"]
 ENV PROGRESS_NO_TRUNC=1
-COPY --from=build /src/_build/install/default/bin/solver-worker /src/_build/install/default/bin/solver-service /usr/local/bin/
+COPY --from=build \
+    /src/pkg/usr/local/bin/solver-worker \
+    /src/pkg/usr/local/bin/solver-service \
+    /usr/local/bin/

service/dune

@@ -11,6 +11,7 @@
   capnp-rpc-unix
   git-unix
   ocaml-version
+  dune-build-info
   str
   fmt.cli
   fmt.tty)

service/main.ml

@@ -149,9 +149,14 @@ let sockpath =
           will use stdin."
        ~docv:"SOCKPATH" [ "sockpath" ]
 
+let version =
+  match Build_info.V1.version () with
+  | None -> "n/a"
+  | Some v -> Build_info.V1.Version.to_string v
+
 let cmd =
   let doc = "Solver for ocaml-ci" in
-  let info = Cmd.info "solver-service" ~doc in
+  let info = Cmd.info "solver-service" ~doc ~version in
   Cmd.v info
     Term.(
       const main