From 791757de6c23a41e4decb6921576411f1e385a54 Mon Sep 17 00:00:00 2001
From: Xavier Claessens <xavier.claessens@collabora.com>
Date: Thu, 29 Nov 2018 15:12:51 -0500
Subject: [PATCH] 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                                         | 9 ++++-----
 docker/{android => ubuntu}/Dockerfile                  | 0
 docker/{android => ubuntu}/android-create-toolchain.sh | 0
 docker/{android => ubuntu}/android-download-ndk.sh     | 0
 docker/{android => ubuntu}/cleanup.sh                  | 0
 docker/{android => ubuntu}/prepare.sh                  | 0
 6 files changed, 4 insertions(+), 5 deletions(-)
 rename docker/{android => ubuntu}/Dockerfile (100%)
 rename docker/{android => ubuntu}/android-create-toolchain.sh (100%)
 rename docker/{android => ubuntu}/android-download-ndk.sh (100%)
 rename docker/{android => ubuntu}/cleanup.sh (100%)
 rename docker/{android => ubuntu}/prepare.sh (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57c6eab..5986301 100644
--- 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
-- 
2.7.4