Merge branch 'master' of gitlab.com:ocaml-platform/ocaml-containers

ocaml-amd64/Dockerfile.alpine-3.8-ocaml-4.08

@@ -5,11 +5,11 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.08 ocaml-variants.4.08.0+trunk && \
-  opam switch create 4.08+afl ocaml-variants.4.08.0+afl && \
-  opam switch create 4.08+flambda ocaml-variants.4.08.0+flambda && \
-  opam switch create 4.08+flambda+fp ocaml-variants.4.08.0+flambda+fp && \
-  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+default-unsafe-string && \
-  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+force-safe-string && \
+  opam switch create 4.08+afl ocaml-variants.4.08.0+trunk+afl && \
+  opam switch create 4.08+flambda ocaml-variants.4.08.0+trunk+flambda && \
+  opam switch create 4.08+flambda+fp ocaml-variants.4.08.0+trunk+flambda+fp && \
+  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+trunk+default-unsafe-string && \
+  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+trunk+force-safe-string && \
   opam switch 4.08 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-amd64/Dockerfile.alpine-3.8-ocaml-4.09

@@ -5,11 +5,11 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.09 ocaml-variants.4.09.0+trunk && \
-  opam switch create 4.09+afl ocaml-variants.4.09.0+afl && \
-  opam switch create 4.09+flambda ocaml-variants.4.09.0+flambda && \
-  opam switch create 4.09+flambda+fp ocaml-variants.4.09.0+flambda+fp && \
-  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+default-unsafe-string && \
-  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+force-safe-string && \
+  opam switch create 4.09+afl ocaml-variants.4.09.0+trunk+afl && \
+  opam switch create 4.09+flambda ocaml-variants.4.09.0+trunk+flambda && \
+  opam switch create 4.09+flambda+fp ocaml-variants.4.09.0+trunk+flambda+fp && \
+  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+trunk+default-unsafe-string && \
+  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+trunk+force-safe-string && \
   opam switch 4.09 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-amd64/Dockerfile.debian-9-ocaml-4.08

@@ -5,11 +5,11 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.08 ocaml-variants.4.08.0+trunk && \
-  opam switch create 4.08+afl ocaml-variants.4.08.0+afl && \
-  opam switch create 4.08+flambda ocaml-variants.4.08.0+flambda && \
-  opam switch create 4.08+flambda+fp ocaml-variants.4.08.0+flambda+fp && \
-  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+default-unsafe-string && \
-  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+force-safe-string && \
+  opam switch create 4.08+afl ocaml-variants.4.08.0+trunk+afl && \
+  opam switch create 4.08+flambda ocaml-variants.4.08.0+trunk+flambda && \
+  opam switch create 4.08+flambda+fp ocaml-variants.4.08.0+trunk+flambda+fp && \
+  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+trunk+default-unsafe-string && \
+  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+trunk+force-safe-string && \
   opam switch 4.08 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-amd64/Dockerfile.debian-9-ocaml-4.09

@@ -5,11 +5,11 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.09 ocaml-variants.4.09.0+trunk && \
-  opam switch create 4.09+afl ocaml-variants.4.09.0+afl && \
-  opam switch create 4.09+flambda ocaml-variants.4.09.0+flambda && \
-  opam switch create 4.09+flambda+fp ocaml-variants.4.09.0+flambda+fp && \
-  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+default-unsafe-string && \
-  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+force-safe-string && \
+  opam switch create 4.09+afl ocaml-variants.4.09.0+trunk+afl && \
+  opam switch create 4.09+flambda ocaml-variants.4.09.0+trunk+flambda && \
+  opam switch create 4.09+flambda+fp ocaml-variants.4.09.0+trunk+flambda+fp && \
+  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+trunk+default-unsafe-string && \
+  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+trunk+force-safe-string && \
   opam switch 4.09 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-arm32v7/Dockerfile.debian-9-ocaml-4.08

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.08 ocaml-variants.4.08.0+trunk && \
-  opam switch create 4.08+afl ocaml-variants.4.08.0+afl && \
-  opam switch create 4.08+flambda ocaml-variants.4.08.0+flambda && \
-  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+default-unsafe-string && \
-  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+force-safe-string && \
+  opam switch create 4.08+afl ocaml-variants.4.08.0+trunk+afl && \
+  opam switch create 4.08+flambda ocaml-variants.4.08.0+trunk+flambda && \
+  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+trunk+default-unsafe-string && \
+  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+trunk+force-safe-string && \
   opam switch 4.08 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-arm32v7/Dockerfile.debian-9-ocaml-4.09

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.09 ocaml-variants.4.09.0+trunk && \
-  opam switch create 4.09+afl ocaml-variants.4.09.0+afl && \
-  opam switch create 4.09+flambda ocaml-variants.4.09.0+flambda && \
-  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+default-unsafe-string && \
-  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+force-safe-string && \
+  opam switch create 4.09+afl ocaml-variants.4.09.0+trunk+afl && \
+  opam switch create 4.09+flambda ocaml-variants.4.09.0+trunk+flambda && \
+  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+trunk+default-unsafe-string && \
+  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+trunk+force-safe-string && \
   opam switch 4.09 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-arm64/Dockerfile.alpine-3.8-ocaml-4.08

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.08 ocaml-variants.4.08.0+trunk && \
-  opam switch create 4.08+afl ocaml-variants.4.08.0+afl && \
-  opam switch create 4.08+flambda ocaml-variants.4.08.0+flambda && \
-  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+default-unsafe-string && \
-  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+force-safe-string && \
+  opam switch create 4.08+afl ocaml-variants.4.08.0+trunk+afl && \
+  opam switch create 4.08+flambda ocaml-variants.4.08.0+trunk+flambda && \
+  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+trunk+default-unsafe-string && \
+  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+trunk+force-safe-string && \
   opam switch 4.08 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-arm64/Dockerfile.alpine-3.8-ocaml-4.09

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.09 ocaml-variants.4.09.0+trunk && \
-  opam switch create 4.09+afl ocaml-variants.4.09.0+afl && \
-  opam switch create 4.09+flambda ocaml-variants.4.09.0+flambda && \
-  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+default-unsafe-string && \
-  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+force-safe-string && \
+  opam switch create 4.09+afl ocaml-variants.4.09.0+trunk+afl && \
+  opam switch create 4.09+flambda ocaml-variants.4.09.0+trunk+flambda && \
+  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+trunk+default-unsafe-string && \
+  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+trunk+force-safe-string && \
   opam switch 4.09 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-arm64/Dockerfile.debian-9-ocaml-4.08

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.08 ocaml-variants.4.08.0+trunk && \
-  opam switch create 4.08+afl ocaml-variants.4.08.0+afl && \
-  opam switch create 4.08+flambda ocaml-variants.4.08.0+flambda && \
-  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+default-unsafe-string && \
-  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+force-safe-string && \
+  opam switch create 4.08+afl ocaml-variants.4.08.0+trunk+afl && \
+  opam switch create 4.08+flambda ocaml-variants.4.08.0+trunk+flambda && \
+  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+trunk+default-unsafe-string && \
+  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+trunk+force-safe-string && \
   opam switch 4.08 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-arm64/Dockerfile.debian-9-ocaml-4.09

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.09 ocaml-variants.4.09.0+trunk && \
-  opam switch create 4.09+afl ocaml-variants.4.09.0+afl && \
-  opam switch create 4.09+flambda ocaml-variants.4.09.0+flambda && \
-  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+default-unsafe-string && \
-  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+force-safe-string && \
+  opam switch create 4.09+afl ocaml-variants.4.09.0+trunk+afl && \
+  opam switch create 4.09+flambda ocaml-variants.4.09.0+trunk+flambda && \
+  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+trunk+default-unsafe-string && \
+  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+trunk+force-safe-string && \
   opam switch 4.09 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-ppc64le/Dockerfile.debian-9-ocaml-4.08

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.08 ocaml-variants.4.08.0+trunk && \
-  opam switch create 4.08+afl ocaml-variants.4.08.0+afl && \
-  opam switch create 4.08+flambda ocaml-variants.4.08.0+flambda && \
-  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+default-unsafe-string && \
-  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+force-safe-string && \
+  opam switch create 4.08+afl ocaml-variants.4.08.0+trunk+afl && \
+  opam switch create 4.08+flambda ocaml-variants.4.08.0+trunk+flambda && \
+  opam switch create 4.08+default-unsafe-string ocaml-variants.4.08.0+trunk+default-unsafe-string && \
+  opam switch create 4.08+force-safe-string ocaml-variants.4.08.0+trunk+force-safe-string && \
   opam switch 4.08 && \
   opam install -y depext
 ENV OPAMYES 1

ocaml-ppc64le/Dockerfile.debian-9-ocaml-4.09

@@ -5,10 +5,10 @@ RUN opam-sandbox-disable && \
   opam init -k git -a /home/opam/opam-repository --bare && \
   opam repo add beta git://github.com/ocaml/ocaml-beta-repository --set-default && \
   opam switch create 4.09 ocaml-variants.4.09.0+trunk && \
-  opam switch create 4.09+afl ocaml-variants.4.09.0+afl && \
-  opam switch create 4.09+flambda ocaml-variants.4.09.0+flambda && \
-  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+default-unsafe-string && \
-  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+force-safe-string && \
+  opam switch create 4.09+afl ocaml-variants.4.09.0+trunk+afl && \
+  opam switch create 4.09+flambda ocaml-variants.4.09.0+trunk+flambda && \
+  opam switch create 4.09+default-unsafe-string ocaml-variants.4.09.0+trunk+default-unsafe-string && \
+  opam switch create 4.09+force-safe-string ocaml-variants.4.09.0+trunk+force-safe-string && \
   opam switch 4.09 && \
   opam install -y depext
 ENV OPAMYES 1