Skip to content

Commit c05923d

Browse files
hhugoOlivierNicole
authored andcommitted
Simplify docker file
1 parent 129d9a5 commit c05923d

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

bench.Dockerfile

+8-7
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ RUN sudo ln -sf /usr/bin/opam-2.3 /usr/bin/opam
77
RUN opam remote add origin https://github.com/ocaml/opam-repository.git && \
88
opam update
99
RUN wget https://nodejs.org/dist/v22.14.0/node-v22.14.0-linux-x64.tar.xz && \
10-
tar xJvf node-v22.14.0-linux-x64.tar.xz && \
11-
sudo cp node-v22.14.0-linux-x64/bin/node /usr/bin/node && \
12-
wget https://github.com/WebAssembly/binaryen/releases/download/version_122/binaryen-version_122-x86_64-linux.tar.gz && \
13-
tar xzvf binaryen-version_122-x86_64-linux.tar.gz && \
14-
sudo cp binaryen-version_122/bin/wasm-opt binaryen-version_122/bin/wasm-metadce binaryen-version_122/bin/wasm-merge /usr/bin/
15-
COPY --chown=opam:opam ./*.opam ./VERSION ./
16-
RUN opam pin -yn --kind=path --with-version=dev .
10+
tar xJvf node-v22.14.0-linux-x64.tar.xz
11+
ENV PATH="/bench-dir/node-v22.14.0-linux-x64/bin:$PATH"
12+
RUN wget https://github.com/WebAssembly/binaryen/releases/download/version_122/binaryen-version_122-x86_64-linux.tar.gz && \
13+
tar xzvf binaryen-version_122-x86_64-linux.tar.gz
14+
ENV PATH="/bench-dir/binaryen-version_122/bin:$PATH"
15+
RUN opam install --fake binaryen-bin
16+
COPY --chown=opam:opam ./*.opam ./
17+
RUN opam pin -yn --with-version=dev .
1718
RUN opam install -y --deps-only js_of_ocaml-compiler
1819
COPY --chown=opam:opam . ./
1920
RUN opam install -y wasm_of_ocaml-compiler

dune-project

+1
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@
141141
(depends
142142
(ocaml (>= 4.14))
143143
(js_of_ocaml (= :version))
144+
(js_of_ocaml-compiler (= :version))
144145
(num :with-test)
145146
(ppx_expect (and (>= v0.14.2) :with-test))
146147
(ppxlib (>= 0.15.0))

wasm_of_ocaml-compiler.opam

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ depends: [
1515
"dune" {>= "3.17"}
1616
"ocaml" {>= "4.14"}
1717
"js_of_ocaml" {= version}
18+
"js_of_ocaml-compiler" {= version}
1819
"num" {with-test}
1920
"ppx_expect" {>= "v0.14.2" & with-test}
2021
"ppxlib" {>= "0.15.0"}

0 commit comments

Comments
 (0)