Skip to content

Commit 38d24df

Browse files
committed
update Dockerfile for opam 2.2 and ocaml 5.3
In particular io-page-unix needs recent opam Signed-off-by: David Scott <[email protected]>
1 parent 131b9ee commit 38d24df

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

Dockerfile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
1-
FROM ocaml/opam:alpine-3.19-ocaml-4.14 AS build
2-
RUN opam update
1+
FROM ocaml/opam:alpine-ocaml-5.3 AS build
2+
RUN opam-2.2 update
33

44
ADD . /home/opam/vpnkit
5-
RUN opam pin add vpnkit /home/opam/vpnkit --kind=path -n
6-
RUN opam depext vpnkit -y
5+
RUN opam-2.2 pin add vpnkit file:///home/opam/vpnkit -n
76

8-
RUN opam install vpnkit -y
9-
10-
FROM scratch AS binary
11-
COPY --from=build /home/opam/.opam/4.14/bin/vpnkit /vpnkit
7+
RUN opam-2.2 install vpnkit -y
128

139
FROM alpine:latest
14-
COPY --from=binary /vpnkit /vpnkit
10+
COPY --from=build /home/opam/.opam/5.3/bin/vpnkit /vpnkit

Dockerfile.test

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
1-
FROM ocaml/opam:alpine-3.19-ocaml-4.14 AS build
2-
RUN opam update
1+
FROM ocaml/opam:alpine-ocaml-5.3 AS build
2+
RUN opam-2.2 update
33

44
ADD . /home/opam/vpnkit
55
RUN sudo chown opam:opam -R vpnkit
66
WORKDIR /home/opam/vpnkit
7-
RUN opam pin add vpnkit /home/opam/vpnkit --kind=path -n
8-
RUN opam depext vpnkit -y
7+
RUN opam-2.2 pin add vpnkit /home/opam/vpnkit --kind=path -n
98

10-
RUN opam install vpnkit -y -t
9+
RUN opam-2.2 install vpnkit -y -t
1110

1211
# unit tests
13-
RUN opam exec -- dune runtest
12+
RUN opam-2.2 exec -- dune runtest
1413
# integration tests
15-
RUN opam exec -- dune build @e2e
14+
RUN opam-2.2 exec -- dune build @e2e
1615

1716
# we're not interested in the intermediate artifacts
1817
FROM scratch

0 commit comments

Comments
 (0)