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).
This commit is contained in:
Xavier Claessens 2018-11-29 15:12:51 -05:00 committed by Xavier Claessens
parent f7331ab4f8
commit 791757de6c
6 changed files with 4 additions and 5 deletions

View file

@ -92,14 +92,13 @@ fedora amd64 docker:
DOCKERFILE: "docker/fedora/Dockerfile" DOCKERFILE: "docker/fedora/Dockerfile"
extends: .base extends: .base
# Cross compile image ubuntu amd64 docker:
android 28 amd64 docker:
stage: "build docker" stage: "build docker"
variables: variables:
ARCH: "amd64" ARCH: "amd64"
TAG: "android_28" TAG: "ubuntu"
CONTEXT_DIR: "docker/android/" CONTEXT_DIR: "docker/ubuntu/"
DOCKERFILE: "docker/android/Dockerfile" DOCKERFILE: "docker/ubuntu/Dockerfile"
extends: .base extends: .base
cerbero fedora amd64 docker: cerbero fedora amd64 docker: