From 52caadda3674c126cbec014f0727e696278868f3 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias <e+git@x80.org>
Date: Mon, 7 May 2018 10:55:39 +0200
Subject: [ci] Add ounit to the base Docker package set.

This should help #6808.
---
 .circleci/config.yml                     | 2 +-
 .gitlab-ci.yml                           | 2 +-
 dev/ci/docker/bionic_coq/Dockerfile      | 5 +++--
 dev/ci/docker/bionic_coq/hooks/post_push | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 07b728edf..c4b7733a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,7 +8,7 @@ defaults:
     # reference syntax)
     working_directory: ~/coq
     docker:
-      - image: coqci/base:V2018-05-05
+      - image: coqci/base:V2018-05-07
 
   environment: &envvars
     NATIVE_COMP: "yes"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 12d3a87b2..78850fa5e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: coqci/base:V2018-05-05
+image: coqci/base:V2018-05-07
 
 stages:
   - build
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile
index 5698175c5..920100157 100644
--- a/dev/ci/docker/bionic_coq/Dockerfile
+++ b/dev/ci/docker/bionic_coq/Dockerfile
@@ -15,12 +15,13 @@ ENV NJOBS="2" \
     OPAMROOT=/root/.opamcache \
     OPAMROOTISOK="true"
 
+# Base opam is the set of base packages required by Coq
 ENV COMPILER="4.02.3" \
-    BASE_OPAM="num ocamlfind jbuilder"
+    BASE_OPAM="num ocamlfind jbuilder ounit"
 
 RUN opam init -a -y -j $NJOBS --compiler="$COMPILER" default https://opam.ocaml.org && eval $(opam config env) && opam update
 
-# Setup of the base switch
+# Setup of the base switch; CI_OPAM contains Coq's CI dependencies.
 ENV CAMLP5_VER="6.14" \
     COQIDE_OPAM="lablgtk.2.18.5 conf-gtksourceview.2" \
     CI_OPAM="menhir elpi ocamlgraph"
diff --git a/dev/ci/docker/bionic_coq/hooks/post_push b/dev/ci/docker/bionic_coq/hooks/post_push
index 008ef1af3..6daf337a7 100755
--- a/dev/ci/docker/bionic_coq/hooks/post_push
+++ b/dev/ci/docker/bionic_coq/hooks/post_push
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-COQCI_VERSION=V2018-05-05
+COQCI_VERSION=V2018-05-07
 docker tag $IMAGE_NAME $DOCKER_REPO:$COQCI_VERSION
 docker push $DOCKER_REPO:$COQCI_VERSION
 
-- 
cgit v1.2.3