Merge branch ci-docker:master into master

This commit is contained in:
ddutchie 2024-03-14 11:18:05 +00:00
commit 38ba707160
2 changed files with 18 additions and 0 deletions

View file

@ -24,6 +24,16 @@ build linux x64:
- docker build -f Dockerfile -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

8
Dockerfile-android Normal file
View file

@ -0,0 +1,8 @@
FROM ubuntu:jammy
ENV ANDROID_HOME=/usr/lib/android-sdk/
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