[gjs: 4/4] Merge branch '185-fix-docker-image-build' into 'master'

[Philip Chimento <pchimento src gnome org>]

commit 451bf764b3fa2ef6f324f9aefc9d555eaaa666a3
Merge: ff4023f7 3210a8fc
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Jul 22 01:44:57 2018 +0000

    Merge branch '185-fix-docker-image-build' into 'master'
    
    Docker image pipeline fixes
    
    See merge request GNOME/gjs!203

 .gitlab-ci.yml         |  3 +++
 test/extra/do_basic.sh | 10 +++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
---