From 670ac8978e7875887acba6cf7d8dba23bb0c160b Mon Sep 17 00:00:00 2001 From: niansa Date: Thu, 14 Mar 2024 10:54:34 +0100 Subject: [PATCH] Added Android Dockerfile --- .gitlab-ci.yml | 10 ++++++++++ Dockerfile-android | 7 +++++++ 2 files changed, 17 insertions(+) create mode 100644 Dockerfile-android diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5180c51..e82e135 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,16 @@ build linux x64: - docker build -f Dockerfile-linux -t ${CI_REGISTRY_IMAGE}:linux-x64 . - docker push ${CI_REGISTRY_IMAGE}:linux-x64 +build android x64: + stage: build + image: docker + services: + - docker:dind + script: + - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER $CI_REGISTRY --password-stdin + - docker build -f Dockerfile-android -t ${CI_REGISTRY_IMAGE}:android-x64 . + - docker push ${CI_REGISTRY_IMAGE}:android-x64 + build windows x64: stage: build image: docker diff --git a/Dockerfile-android b/Dockerfile-android new file mode 100644 index 0000000..a094a15 --- /dev/null +++ b/Dockerfile-android @@ -0,0 +1,7 @@ +FROM ubuntu:jammy +RUN apt-get update --yes \ + && apt-get install --yes ccache apksigner glslang-dev glslang-tools git sdkmanager android-sdk bash openjdk-17-jdk openjdk-17-jre curl zip unzip tar cmake ninja-build pkg-config \ + && apt-get install --yes --no-install-recommends clang-14 lld-14 llvm-14 llvm-14-linker-tools \ + && apt-get clean \ + && ln -s $(which clang-14) /usr/bin/clang && ln -s $(which clang++-14) /usr/bin/clang++ \ + && echo y | sdkmanager --sdk_root=/usr/lib/android-sdk --licenses