ci: Use images from funkwhale/ci instead of building one ourself
This commit is contained in:
parent
585af743f2
commit
a666490bd0
|
@ -1,4 +1,5 @@
|
|||
image: $CI_REGISTRY/funkwhale/funkwhale-android:latest
|
||||
# This image lives in https://dev.funkwhale.audio/funkwhale/ci
|
||||
image: $CI_REGISTRY/funkwhale/ci/android:latest
|
||||
|
||||
variables:
|
||||
COBERTURA_REPORT: '$CI_PROJECT_DIR/app/build/reports/cobertura.xml'
|
||||
|
@ -12,26 +13,6 @@ stages:
|
|||
- build
|
||||
- deploy
|
||||
|
||||
build_ci_image:
|
||||
stage: build_ci_env
|
||||
image: egon0/docker-with-buildx-and-git:bash
|
||||
tags:
|
||||
- dind
|
||||
services:
|
||||
- docker:20-dind
|
||||
before_script:
|
||||
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
|
||||
script:
|
||||
- docker build -t $CI_REGISTRY_IMAGE docker
|
||||
after_script:
|
||||
- docker push $CI_REGISTRY_IMAGE
|
||||
rules:
|
||||
- if: '$BUILD_CI_IMAGE'
|
||||
variables:
|
||||
DOCKER_HOST: tcp://docker:2375/
|
||||
DOCKER_DRIVER: overlay2
|
||||
DOCKER_TLS_CERTDIR: ""
|
||||
|
||||
cache: &global_cache
|
||||
key: ${CI_PIPELINE_ID}
|
||||
paths:
|
||||
|
|
|
@ -1,17 +0,0 @@
|
|||
FROM debian:stable-slim
|
||||
|
||||
ENV ANDROID_COMPILE_SDK=33
|
||||
ENV SDK_TOOLS_VERSION=32.0.0
|
||||
ENV ANDROID_CMD_TOOLS=9123335
|
||||
ENV ANDROID_HOME=/opt/android-sdk-linux
|
||||
ENV PATH "/opt/android-sdk-linux/cmdline-tools/bin:${PATH}"
|
||||
|
||||
RUN apt-get update && apt-get install --yes openjdk-11-jdk wget tar unzip lib32stdc++6 lib32z1 git
|
||||
RUN mkdir -p /opt/android-sdk-linux && cd /opt \
|
||||
&& wget -q https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_CMD_TOOLS}_latest.zip -O android-sdk-tools.zip \
|
||||
&& unzip -q android-sdk-tools.zip -d ${ANDROID_HOME} \
|
||||
&& rm -f android-sdk-tools.zip \
|
||||
&& echo y | sdkmanager --sdk_root=${ANDROID_HOME} "platforms;android-${ANDROID_COMPILE_SDK}" \
|
||||
&& echo y | sdkmanager --sdk_root=${ANDROID_HOME} "platform-tools" \
|
||||
&& echo y | sdkmanager --sdk_root=${ANDROID_HOME} "build-tools;${SDK_TOOLS_VERSION}"
|
||||
|
Loading…
Reference in New Issue