Updated opam and docker stuff

daypack-dev · Mar 30, 2023 · d4c672d · d4c672d
1 parent f5d9dc5
commit d4c672d
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 22 deletions.
diff --git a/containers/timedesc/Dockerfile b/containers/timedesc/Dockerfile
@@ -3,7 +3,7 @@ USER root
 RUN apt-get update
 RUN apt-get install --yes pkg-config
 RUN opam install dune containers fmt
-RUN opam install mparser re ptime oseq seq diet
+RUN opam install re ptime oseq seq diet
 RUN opam install yojson fileutils
 RUN opam install utop ocp-indent
 RUN opam install alcotest crowbar

diff --git a/containers/timere/Dockerfile b/containers/timere/Dockerfile
@@ -4,11 +4,8 @@ RUN apt-get update
 RUN apt-get install --yes pkg-config
 RUN apt-get install --yes afl
 RUN opam install dune containers fmt
-RUN opam install mparser re ptime oseq seq diet
+RUN opam install re ptime oseq seq diet
 RUN opam install yojson fileutils
-RUN opam install utop ocp-indent
 RUN opam install alcotest crowbar
-RUN opam install js_of_ocaml js_of_ocaml-ppx lwt_ppx
-RUN opam install js_of_ocaml-lwt qcheck qcheck-alcotest
-RUN opam install angstrom
+RUN opam install mparser angstrom
 RUN opam install sexplib
diff --git a/start-container-timere.sh b/start-container-timere.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+podman run -it -v ~/timere:/root/timere --rm localhost/timere
diff --git a/timedesc-json.opam b/timedesc-json.opam
@@ -18,15 +18,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timedesc-sexp.opam b/timedesc-sexp.opam
@@ -18,15 +18,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timedesc-tzdb.opam b/timedesc-tzdb.opam
@@ -20,15 +20,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timedesc-tzlocal-js.opam b/timedesc-tzlocal-js.opam
@@ -19,15 +19,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timedesc-tzlocal.opam b/timedesc-tzlocal.opam
@@ -24,15 +24,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timedesc.opam b/timedesc.opam
@@ -37,15 +37,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timere-parse.opam b/timere-parse.opam
@@ -35,15 +35,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}

diff --git a/timere.opam b/timere.opam
@@ -38,15 +38,16 @@ depends: [
   "odoc" {with-doc}
 ]
 build: [
-  ["dune" "subst"] {dev}
+  ["dune" "subst" "--root" "."] {dev}
   [
     "dune"
     "build"
     "-p"
     name
     "-j"
     jobs
-    "--promote-install-files=false"
+    "--promote-install-files"
+    "false"
     "@install"
 
     "@doc" {with-doc}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		podman run -it -v ~/timere:/root/timere --rm localhost/timere