Install latest cmake

The build script, build_sparkd.sh, uses the '-S' option, which wasn't
introduced until v3.13

Dockerfile

@@ -2,12 +2,21 @@ FROM ubuntu:bionic
 
 
 RUN apt-get update && \
-DEBIAN_FRONTEND=noninteractive apt-get install -y gnupg wget 
+DEBIAN_FRONTEND=noninteractive apt-get install -y \
+  gnupg \
+  software-properties-common \
+  wget
 
 RUN \
 echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-9 main" >> /etc/apt/sources.list && \
 wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key > llvm_key && apt-key add llvm_key
 
+# Add Kitware repo to get latest cmake
+RUN \
+    wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | apt-key add - && \
+    apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main' && \
+    apt update
+
 RUN \
 apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  libllvm-9-ocaml-dev libllvm9 llvm-9 llvm-9-dev llvm-9-doc llvm-9-examples llvm-9-runtime \
@@ -49,6 +58,8 @@ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  openssh-server \
  pkg-config \
  python-pip \
+ python3-pip \
+ python3-venv \
  screen \
  silversearcher-ag \
  sudo \
@@ -78,7 +89,6 @@ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
  mono-reference-assemblies-4.0 \
  bash-completion \
  libpq-dev \
- libiml-dev \
  libpqxx-dev \
  zip \
  parallel \
@@ -103,6 +113,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y ccache
 
 
 run pip install pybars3 paramiko mkdocs
+run pip3 install paramiko cryptography
 run npm install -g npx
 
 # fix locale so we can run tmux
@@ -211,15 +222,18 @@ RUN \
         libpcap0.8-dev \
         libtool-bin \
     && cd /tmp \
-    && curl -fSL https://www.openonload.org/download/openonload-${ONLOAD_VERSION}.tgz -o /tmp/openonload-${ONLOAD_VERSION}.tgz \
-    && echo "${ONLOAD_MD5SUM} openonload-${ONLOAD_VERSION}.tgz" | md5sum --check \
-    && tar -zxf openonload-${ONLOAD_VERSION}.tgz \
-    && cd /tmp/openonload-${ONLOAD_VERSION} \
+##    && curl -fSL https://www.openonload.org/download/openonload-${ONLOAD_VERSION}.tgz -o /tmp/openonload-${ONLOAD_VERSION}.tgz \
+    && curl -fSL https://github.com/rigtorp/openonload/archive/master.zip -o /tmp/openonload-${ONLOAD_VERSION}.zip \
+##    && echo "${ONLOAD_MD5SUM} openonload-${ONLOAD_VERSION}.tgz" | md5sum --check \
+##    && tar -zxf openonload-${ONLOAD_VERSION}.tgz \
+    && unzip -a openonload-${ONLOAD_VERSION}.zip \
+##    && cd /tmp/openonload-${ONLOAD_VERSION} \
+    && cd /tmp/openonload-master \
     && cd scripts \
     && ./onload_build --user \
     && ./onload_install --userfiles --nobuild \
     && cd /tmp \
-    && rm -rf openonload-${ONLOAD_VERSION}.tgz openonload-${ONLOAD_VERSION} \
+    && rm -rf openonload* \
     && if [ -z ${ONLOAD_WITHZF} ] ; then rm -rf /usr/include/zf /usr/bin/zf_stackdump /usr/bin/zf_debug /usr/lib/x86_64-linux-gnu/zf /usr/lib/x86_64-linux-gnu/libonload_zf* ; fi \
     && DEBIAN_FRONTEND=noninteractive apt-get remove -y --purge \
         curl \
@@ -246,4 +260,4 @@ cd cgdb && \
 git checkout v0.7.1 && \
 ./autogen.sh && \
 ./configure && make -j$(nproc) && \
-make install
+make install