diff options
| author | Cyril Cohen | 2020-03-12 11:52:22 +0100 |
|---|---|---|
| committer | GitHub | 2020-03-12 11:52:22 +0100 |
| commit | bf4ddf1894c6ac63dffae2bdad8f8c5300ba0954 (patch) | |
| tree | f54adba22ff99ab008ad18ed089ae6946670260d /Dockerfile | |
| parent | 7d04173b52cf02717b8f8e8c13bb7c3521de7e89 (diff) | |
| parent | 3ae871fff2165c27b8bb389f1829766a4d6f00d9 (diff) | |
Merge pull request #455 from erikmd/bump-opam
[ci] Simplify {Dockerfile,Dockerfile.make} & Restore the "opam clean -c" option
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 17 |
1 files changed, 6 insertions, 11 deletions
@@ -5,18 +5,12 @@ WORKDIR /home/coq/mathcomp COPY . . -ARG compiler="base" -# other possible value: "edge" - RUN ["/bin/bash", "--login", "-c", "set -x \ - && declare -A switch_table \ - && switch_table=( [\"base\"]=\"${COMPILER}\" [\"edge\"]=\"${COMPILER_EDGE}\" ) \ - && opam_switch=\"${switch_table[${compiler}]}\" \ - && [ -n \"opam_switch\" ] \ - && opam switch set ${opam_switch} \ + && [ -n \"${COMPILER_EDGE}\" ] \ + && opam switch set \"${COMPILER_EDGE}\" \ && eval $(opam env) \ - && unset \"switch_table[${compiler}]\" \ - && for sw in \"${switch_table[@]}\"; do if [ -n \"$sw\" ]; then opam switch remove -y \"${sw}\"; fi; done \ + && [ -n \"${COMPILER}\" ] \ + && opam switch remove -y \"${COMPILER}\" \ && opam repository add --all-switches --set-default coq-extra-dev https://coq.inria.fr/opam/extra-dev \ && opam repository add --all-switches --set-default coq-core-dev https://coq.inria.fr/opam/core-dev \ && opam update -y \ @@ -29,10 +23,11 @@ RUN ["/bin/bash", "--login", "-c", "set -x \ && opam pin add -n -k path coq-mathcomp-field . \ && opam pin add -n -k path coq-mathcomp-character . \ && opam install -y -v -j ${NJOBS} coq-mathcomp-character \ - && opam clean -a -s --logs"] + && opam clean -a -c -s --logs"] FROM coqorg/base:bare +ENV COMPILER="" ENV MATHCOMP_VERSION="dev" ENV MATHCOMP_PACKAGE="coq-mathcomp-character" |