make Dockerfile use Dune Developer Preview to build

Author: sabine

.dockerignore

@@ -6,7 +6,7 @@
 !tool/
 !dune
 !dune-project
-!ocamlorg.opam
+!dune-workspace
 !tailwind.config.js
 !init-cache
 !.git

Dockerfile

@@ -1,7 +1,10 @@
-FROM ocaml/opam:alpine-3.21-ocaml-5.2 AS build
+FROM alpine:3.21 AS build
 
 # Install system dependencies
-RUN sudo apk -U upgrade --no-cache && sudo apk add --no-cache \
+RUN apk -U upgrade --no-cache && apk add --no-cache \
+    # to download and install Dune Developer Preview with alpine:3.21
+    build-base patch tar ca-certificates git rsync curl sudo bash \
+       libx11-dev nano coreutils xz \
     autoconf \
     curl-dev \
     gmp-dev \
@@ -10,39 +13,34 @@ RUN sudo apk -U upgrade --no-cache && sudo apk add --no-cache \
     oniguruma-dev \
     openssl-dev
 
-# Use Opam 2.2 and enable the backup mirror if primary sources of packages are unavailable
-RUN sudo mv /usr/bin/opam-2.2 /usr/bin/opam && opam update
-RUN opam option --global 'archive-mirrors+="https://opam.ocaml.org/cache"'
-
-# Branch freeze was opam-repo HEAD at the time of commit
-RUN cd ~/opam-repository && git reset --hard 584630e7a7e27e3cf56158696a3fe94623a0cf4f && opam update
-
-WORKDIR /home/opam
-
-# Install opam dependencies
-COPY --chown=opam ocamlorg.opam .
-RUN opam install . --deps-only
+# Install Dune Developer Preview
+RUN curl -fsSL https://get.dune.build/install | sh
+RUN /bin/bash -c 'source "/root/.local/share/dune/env/env.bash"'
+ENV PATH="/root/.local/bin:$PATH"
 
 # Build project
-COPY --chown=opam . .
-RUN opam exec -- dune build @install --profile=release
+WORKDIR "/root/ocaml.org"
+COPY --chown=root . .
+RUN ls
+
+RUN dune pkg lock
+RUN dune build @install --profile=release
 
 # Launch project in order to generate the package state cache
-RUN cd ~/opam-repository && git checkout master && git pull origin master && opam update
 ENV OCAMLORG_PKG_STATE_PATH=package.state \
     OCAMLORG_REPO_PATH=opam-repository
 RUN touch package.state && ./init-cache package.state
 
-FROM alpine:3.19
+FROM alpine:3.21
 
 RUN apk -U upgrade --no-cache && apk add --no-cache \
     git \
     gmp \
     libev
 
-COPY --from=build /home/opam/package.state /var/package.state
-COPY --from=build /home/opam/opam-repository /var/opam-repository
-COPY --from=build /home/opam/_build/default/src/ocamlorg_web/bin/main.exe /bin/server
+COPY --from=build "/root/ocaml.org/package.state" /var/package.state
+COPY --from=build "/root/ocaml.org/opam-repository" /var/opam-repository
+COPY --from=build "/root/ocaml.org/_build/default/src/ocamlorg_web/bin/main.exe" /bin/server
 
 COPY playground/asset playground/asset
 

init-cache

@@ -4,7 +4,7 @@ STATE=$1
 
 rm -f $STATE
 touch  $STATE
-opam exec -- dune exec src/ocamlorg_web/bin/main.exe &
+dune exec src/ocamlorg_web/bin/main.exe &
 PID=$!
 echo PID=$PID
 inotifywait -e close_write $STATE