Alias opam-2.1 as opam

ocurrent · Jul 3, 2023 · 0d6f81f · 0d6f81f
1 parent 78a4ddf
commit 0d6f81f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
 FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5ce947a2707d3cfe0d2a8918ef41c8b5f88ccddfcace11871c5f553afac189ed AS build
+RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
 RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard f35584e0c472f68694d003e96ba513b1ca7b17c6 && opam update
 COPY --chown=opam \
@@ -38,9 +39,9 @@ RUN opam pin add -yn current_docker.dev "./ocurrent" && \
     opam pin add -yn solver-worker.dev "./solver-service" && \
     opam pin add -yn ocluster-api.dev "./ocluster"
 COPY --chown=opam ocaml-ci.opam ocaml-ci-service.opam ocaml-ci-api.opam /src/
-RUN opam-2.1 install -y --deps-only .
+RUN opam install -y --deps-only .
 ADD --chown=opam . .
-RUN opam-2.1 exec -- dune build ./_build/install/default/bin/ocaml-ci-service
+RUN opam exec -- dune build ./_build/install/default/bin/ocaml-ci-service
 
 FROM debian:11
 RUN apt-get update && apt-get install libev4 openssh-client curl gnupg2 dumb-init git graphviz libsqlite3-dev ca-certificates netbase -y --no-install-recommends

diff --git a/Dockerfile.gitlab b/Dockerfile.gitlab
@@ -1,4 +1,5 @@
 FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5ce947a2707d3cfe0d2a8918ef41c8b5f88ccddfcace11871c5f553afac189ed AS build
+RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
 RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard f35584e0c472f68694d003e96ba513b1ca7b17c6 && opam update
 COPY --chown=opam \
@@ -44,9 +45,9 @@ RUN opam pin add -yn current_docker.dev "./ocurrent" && \
     opam pin add -yn solver-service.dev "./solver-service" && \
     opam pin add -yn ocluster-api.dev "./ocluster"
 COPY --chown=opam ocaml-ci.opam ocaml-ci-gitlab.opam ocaml-ci-service.opam ocaml-ci-api.opam /src/
-RUN opam-2.1 install -y --deps-only .
+RUN opam install -y --deps-only .
 ADD --chown=opam . .
-RUN opam-2.1 exec -- dune build ./_build/install/default/bin/ocaml-ci-gitlab
+RUN opam exec -- dune build ./_build/install/default/bin/ocaml-ci-gitlab
 
 FROM debian:11
 RUN apt-get update && apt-get install libev4 openssh-client curl gnupg2 dumb-init git graphviz libsqlite3-dev ca-certificates netbase -y --no-install-recommends

diff --git a/Dockerfile.web b/Dockerfile.web
@@ -1,4 +1,5 @@
 FROM ocaml/opam:debian-11-ocaml-4.14@sha256:5ce947a2707d3cfe0d2a8918ef41c8b5f88ccddfcace11871c5f553afac189ed AS build
+RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
 RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libgmp-dev libssl-dev libffi-dev libsqlite3-dev -y --no-install-recommends
 RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard f35584e0c472f68694d003e96ba513b1ca7b17c6 && opam update
 COPY --chown=opam \