Rename 'android' docker image back to 'ubuntu'
authorXavier Claessens <xavier.claessens@collabora.com>
Thu, 29 Nov 2018 20:12:51 +0000 (15:12 -0500)
committerXavier Claessens <xclaesse@gmail.com>
Thu, 13 Dec 2018 17:08:16 +0000 (17:08 +0000)
commit791757de6c23a41e4decb6921576411f1e385a54
treed1f60d0921b571b1d4f766c11608678c630e4702
parentf7331ab4f87206087db5b33b95168a558a60a577
Rename 'android' docker image back to 'ubuntu'

There is no point in doing a different docker image for each build we
are going to do inside an Ubuntu distro. We can later use the same image
for native ubuntu builds, or other cross builds (e.g. android API 21,
etc).
.gitlab-ci.yml
docker/ubuntu/Dockerfile [moved from docker/android/Dockerfile with 100% similarity]
docker/ubuntu/android-create-toolchain.sh [moved from docker/android/android-create-toolchain.sh with 100% similarity]
docker/ubuntu/android-download-ndk.sh [moved from docker/android/android-download-ndk.sh with 100% similarity]
docker/ubuntu/cleanup.sh [moved from docker/android/cleanup.sh with 100% similarity]
docker/ubuntu/prepare.sh [moved from docker/android/prepare.sh with 100% similarity]