Use Qt 5.6 on Ubuntu 16.04

.circleci/config.yml

@@ -7,25 +7,34 @@ shared: &shared
     - checkout
     - setup_remote_docker:
         version: 17.05.0-ce
+    - attach_workspace:
+        at: /tmp/workspace
+    - run:
+        name: Load archived Docker image
+        command: if [ -f /tmp/workspace/image.tar.gz ]; then docker load -i /tmp/workspace/image.tar.gz; fi
     - run:
         name: Build image
         command: |
           ./build-image.sh $CIRCLE_JOB
         environment:
           IMAGE_USER: lmmsci
           IMAGE_PREFIX: ""
+    - persist_to_workspace:
+        root: .
+        paths:
+          - ./image.tar.gz
 
 xenial: &xenial
   <<: *shared
   environment:
-    UBUNTU_VERSION: "xenial"
+    UBUNTU_VERSION: "16.04"
 version: 2
 jobs:
-  base:xenial:
+  base:16.04:
     <<: *xenial
-  linux:xenial:
+  linux:16.04:
     <<: *xenial
-  linux.gcc:xenial:
+  linux.gcc:16.04:
     <<: *xenial
 
   base:18.04:
@@ -42,13 +51,13 @@ workflows:
   version: 2
   build_images:
     jobs:
-      - base:xenial
-      - linux:xenial:
+      - base:16.04
+      - linux:16.04:
           requires:
-            - base:xenial
-      - linux.gcc:xenial:
+            - base:16.04
+      - linux.gcc:16.04:
           requires:
-           - linux:xenial
+           - linux:16.04
       - base:18.04
       - linux:18.04:
           requires:

base/Dockerfile

@@ -1,31 +1,32 @@
 ARG UBUNTU_VERSION
 FROM ubuntu:${UBUNTU_VERSION}
+ARG UBUNTU_VERSION
 
 ENV UBUNTU_VERSION ${UBUNTU_VERSION}
 
 RUN apt-get update && apt-get install -y    \
     --no-install-recommends                 \
     ca-certificates                         \
+    software-properties-common              \
     make                                    \
     libc6-dev                               \
     cmake                                   \
     git                                     \
     ssh-client                              \
-    qt5-default                             \
-    qttools5-dev-tools                      \
     perl                                    \
     libxml2-utils                           \
     libxml-perl                             \
     liblist-moreutils-perl                  \
 && rm -rf /var/lib/apt/lists/*
 
-# On Ubuntu 14.04 Qt5LinguistToolsConfig.cmake is provided by qttools5-dev, in
-# later versions it was moved to qttools5-dev-tools. lupdate itself is always
-# provided by qttools5-dev-tools
-RUN if [ "$UBUNTU_VERSION" = "14.04" ]; then  \
-    apt-get update && apt-get install -y      \
-        qttools5-dev                          \
-;fi                                           \
+RUN if [ "$UBUNTU_VERSION" = "18.04" ]; then           \
+    apt-get update && apt-get install -y               \
+        qt5-default qttools5-dev-tools                 \
+;else                                                  \
+    add-apt-repository ppa:beineri/opt-qt563-xenial && \
+    apt-get update && apt-get install -y               \
+        qt56base qt56tools                             \
+;fi                                                    \
 && rm -rf /var/lib/apt/lists/*
 
 ADD ccache.sha256 /tmp/ccache/ccache.sha256

build-image.sh

@@ -37,6 +37,8 @@ docker build            \
     --build-arg UBUNTU_VERSION="$UBUNTU_VERSION" \
     $DOCKERFILE
 
+docker save $IMAGE:$TAG | gzip > image.tar.gz
+
 if [ "$CIRCLE_BRANCH" = "master" ]; then
 	log "Logging in to Docker"
 	docker login -u $DOCKER_USER -p $DOCKER_PASS

linux/Dockerfile

@@ -1,5 +1,6 @@
 ARG UBUNTU_VERSION
 FROM lmmsci/base:${UBUNTU_VERSION}
+ARG UBUNTU_VERSION
 
 RUN dpkg --add-architecture i386
 
@@ -26,10 +27,19 @@ RUN apt-get update -qq &&       \
         portaudio19-dev         \
         gcc-multilib            \
         g++-multilib            \
-        qt5-default             \
-        qtbase5-dev             \
-        libqt5x11extras5-dev    \
         libxcb-keysyms1-dev     \
         libxcb-util0-dev        \
-        qtbase5-private-dev     \
+&& rm -rf /var/lib/apt/lists/*
+
+RUN if [ "$UBUNTU_VERSION" = "18.04" ]; then \
+    apt-get update -qq &&                     \
+    apt-get install -y                        \
+    --no-install-recommends                   \
+        libqt5x11extras5-dev                  \
+        qtbase5-private-dev                   \
+;else                                         \
+    apt-get update -qq &&                     \
+    apt-get install -y                        \
+        qt56x11extras                         \
+;fi                                           \
 && rm -rf /var/lib/apt/lists/*