Update docker images

docker/ubuntu/bionic-base/Dockerfile

@@ -1,37 +1,41 @@
 FROM ubuntu:bionic
 
-WORKDIR /tmp
+ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -y && \
-        apt-get upgrade -y && \
-        apt-get install -y \
-        curl \
-        software-properties-common
-
-RUN apt-get update -y && \
-        apt-get upgrade -y && \
-        apt-get install -y \
-        automake \
-        autoconf \
-        bison \
-        build-essential \
-        doxygen \
-        flex \
-        g++ \
-        git \
-        graphviz \
-        libffi-dev \
-        libncurses5-dev \
-        libopenmpi-dev \
-        libsqlite3-dev \
-        libtool \
-        lsb-release \
-        mcpp \
-        openmpi-bin \
-        zlib1g-dev
+    apt-get upgrade -y && \
+    apt-get install -y \
+    autoconf \
+    automake \
+    bash-completion \
+    bison \
+    build-essential \
+    clang \
+    clang-format \
+    clang-tidy \
+    debhelper \
+    default-jdk-headless \
+    devscripts \
+    doxygen \
+    fakeroot \
+    flex \
+    g++ \
+    gcovr \
+    gdb \
+    git \
+    graphviz \
+    libffi-dev \
+    libncurses5-dev \
+    libsqlite3-dev \
+    libtool \
+    make \
+    mcpp \
+    pkg-config \
+    python3-dev \
+    sqlite \
+    swig \
+    zlib1g-dev
 
 RUN useradd --create-home --shell /bin/bash souffle
 
-USER souffle
-
 WORKDIR /home/souffle

docker/ubuntu/bionic/Dockerfile

@@ -11,6 +11,10 @@ ARG SOUFFLE_MAKE_JOBS="2"
 ENV CC "${SOUFFLE_CC}"
 ENV CXX "${SOUFFLE_CXX}"
 
+RUN apt install -y git
+
+USER souffle
+
 RUN git clone https://github.com/${SOUFFLE_GITHUB_USER}/souffle /home/souffle/souffle
 
 WORKDIR /home/souffle/souffle
@@ -22,12 +26,14 @@ RUN git clean -xdf
 RUN ./bootstrap
 RUN ./configure ${SOUFFLE_CONFIGURE_OPTIONS}
 RUN make -j${SOUFFLE_MAKE_JOBS}
-RUN ./src/souffle
+RUN ./src/souffle --version
 
 USER root
 
 RUN make install -j${SOUFFLE_MAKE_JOBS}
 
-WORKDIR /
+USER souffle
+
+WORKDIR /home/souffle
 
 RUN souffle -h

docker/ubuntu/focal-base/Dockerfile

@@ -0,0 +1,41 @@
+FROM ubuntu:focal
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update -y && \
+    apt-get upgrade -y && \
+    apt-get install -y \
+    autoconf \
+    automake \
+    bash-completion \
+    bison \
+    build-essential \
+    clang \
+    clang-format \
+    clang-tidy \
+    debhelper \
+    default-jdk-headless \
+    devscripts \
+    doxygen \
+    fakeroot \
+    flex \
+    g++ \
+    gcovr \
+    gdb \
+    git \
+    graphviz \
+    libffi-dev \
+    libncurses5-dev \
+    libsqlite3-dev \
+    libtool \
+    make \
+    mcpp \
+    pkg-config \
+    python3-dev \
+    sqlite \
+    swig \
+    zlib1g-dev
+
+RUN useradd --create-home --shell /bin/bash souffle
+
+WORKDIR /home/souffle