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).

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57c6eab..5986301 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -92,14 +92,13 @@ fedora amd64 docker:
     DOCKERFILE: "docker/fedora/Dockerfile"
   extends: .base
 
-# Cross compile image
-android 28 amd64 docker:
+ubuntu amd64 docker:
   stage: "build docker"
   variables:
     ARCH: "amd64"
-    TAG: "android_28"
-    CONTEXT_DIR: "docker/android/"
-    DOCKERFILE: "docker/android/Dockerfile"
+    TAG: "ubuntu"
+    CONTEXT_DIR: "docker/ubuntu/"
+    DOCKERFILE: "docker/ubuntu/Dockerfile"
   extends: .base
 
 cerbero fedora amd64 docker:

diff --git a/docker/android/Dockerfile b/docker/ubuntu/Dockerfile
similarity index 100%
rename from docker/android/Dockerfile
rename to docker/ubuntu/Dockerfile

diff --git a/docker/android/android-create-toolchain.sh b/docker/ubuntu/android-create-toolchain.sh
similarity index 100%
rename from docker/android/android-create-toolchain.sh
rename to docker/ubuntu/android-create-toolchain.sh

diff --git a/docker/android/android-download-ndk.sh b/docker/ubuntu/android-download-ndk.sh
similarity index 100%
rename from docker/android/android-download-ndk.sh
rename to docker/ubuntu/android-download-ndk.sh

diff --git a/docker/android/cleanup.sh b/docker/ubuntu/cleanup.sh
similarity index 100%
rename from docker/android/cleanup.sh
rename to docker/ubuntu/cleanup.sh

diff --git a/docker/android/prepare.sh b/docker/ubuntu/prepare.sh
similarity index 100%
rename from docker/android/prepare.sh
rename to docker/ubuntu/prepare.sh