Run build scripts as part of running the container, not building it

Dockerfile

@@ -23,21 +23,11 @@ RUN echo "build ALL=(ALL) NOPASSWD: ALL" | tee -a /etc/sudoers
 USER build
 WORKDIR /home/build/
 
-# TODO: everything from this point could be done by the container and not the image
-COPY clone-qt.sh /home/build
-RUN ./clone-qt.sh
-
-ENV MAKEFLAGS=-j8
-COPY build-qt.sh /home/build
-RUN ./build-qt.sh
-
-COPY build-qtbase-tests.sh /home/build
-RUN ./build-qtbase-tests.sh
-
-COPY build-qtwayland-tests.sh /home/build
-RUN ./build-qtwayland-tests.sh
+ENV QT_DOCKERTEST_QT5_REV=dev
 
 ENV XDG_RUNTIME_DIR=/tmp
 ENV QT_QPA_PLATFORM=wayland
-COPY test-qt.sh /home/build
-CMD "./test-qt.sh"
+ENV MAKEFLAGS=-j8
+
+COPY scripts/ /home/build/scripts
+CMD "./scripts/run.sh"

clone-qt.sh

-#!/bin/bash
-set -ex
-qt5_rev=5.11 #maybe set this from the Dockerfile
-qtwayland_rev=5.11
-rm -rf qt5
-mkdir qt5
-cd qt5
-git init
-git remote add origin https://codereview.qt-project.org/qt/qt5.git
-git fetch --depth 1 origin "$qt5_rev"
-git checkout FETCH_HEAD
-
-git submodule update --init --depth 1 -- qtbase qtxmlpatterns qtdeclarative qtwayland
-
-cd qtwayland
-git fetch --depth 1 origin "$qtwayland_rev"
-git checkout FETCH_HEAD

build-qt.sh → scripts/build-qt.sh

@@ -12,4 +12,4 @@ cd build-qt
     -nomake examples \
     -nomake tests \
     -feature-wayland-client
-time make -ks module-qtwayland
+make -ks module-qtwayland

scripts/clone-qt.sh

+#!/bin/bash
+set -ex
+qt5_rev=${QT_DOCKERTEST_QT5_REV:-5.11}
+rm -rf qt5
+mkdir qt5
+cd qt5
+git init
+git remote add origin https://codereview.qt-project.org/qt/qt5.git
+git fetch --depth 1 origin "$qt5_rev"
+git checkout FETCH_HEAD
+
+#proper shallow cloning doesn't work for debian stretch for some reason
+#git submodule update --init --depth 1 -- qtbase qtxmlpatterns qtdeclarative qtwayland
+git submodule update --init --depth 50 -- qtbase qtxmlpatterns qtdeclarative qtwayland
+
+if [[ -v QT_DOCKERTEST_QTWAYLAND_REV ]] ; then
+    cd qtwayland
+    git fetch --depth 1 origin "$QT_DOCKERTEST_QTWAYLAND_REV"
+    git checkout FETCH_HEAD
+fi

scripts/run.sh

+#!/bin/bash
+set -ex
+time scripts/clone-qt.sh
+echo Finished cloning
+time scripts/build-qt.sh
+echo Finished building
+time scripts/build-qtbase-tests.sh
+echo Finished building qtbase tests
+time scripts/build-qtwayland-tests.sh
+echo Finished building qtwayland tests
+time scripts/test-qt.sh
+echo Finished testing