From df6959e31c033f52b9e03b39b18d12baa573e494 Mon Sep 17 00:00:00 2001 From: Jacques-Pascal Deplaix Date: Thu, 22 Feb 2018 16:46:33 +0000 Subject: [PATCH] Fix travis docker when the current image is using the system switch --- .travis-docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis-docker.sh b/.travis-docker.sh index 3bbba69..1c4af17 100644 --- a/.travis-docker.sh +++ b/.travis-docker.sh @@ -44,9 +44,9 @@ fi echo RUN opam update -u -y >> Dockerfile echo RUN opam depext -ui travis-opam >> Dockerfile -echo RUN cp "~/.opam/${OCAML_VERSION}/bin/ci-opam" "~/" >> Dockerfile +echo RUN cp '~/.opam/$(opam switch show)/bin/ci-opam' "~/" >> Dockerfile echo RUN opam remove -a travis-opam >> Dockerfile -echo RUN mv "~/ci-opam" "~/.opam/${OCAML_VERSION}/bin/ci-opam" >> Dockerfile +echo RUN mv "~/ci-opam" '~/.opam/$(opam switch show)/bin/ci-opam' >> Dockerfile echo VOLUME /repo >> Dockerfile echo WORKDIR /repo >> Dockerfile docker build -t local-build .