External/docker-android
1
0
Fork 0
mirror of https://github.com/HQarroum/docker-android.git synced 2026-07-15 06:47:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

revert back to alpine

Browse Source
This commit is contained in:
Halim Qarroum
2023-02-15 14:16:05 +00:00
parent f68d087293
commit def2d40311
2 changed files with 115 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/docker-image.yml
+103 -108
View File
@@ -14,10 +14,6 @@ jobs:
build-api-33: build-api-33:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to Docker Hub - name: Login to Docker Hub
uses: docker/login-action@v2 uses: docker/login-action@v2
with: with:
@@ -27,116 +23,115 @@ jobs:
uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
with: with:
push: true push: true
platforms: linux/amd64,linux/arm/v8
tags: halimqarroum/docker-android:api-33 tags: halimqarroum/docker-android:api-33
build-args: API_LEVEL=33 build-args: API_LEVEL=33
# build-api-32: build-api-32:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build Docker image with Android 32 - name: Build Docker image with Android 32
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:api-32 tags: halimqarroum/docker-android:api-32
# build-args: API_LEVEL=32 build-args: API_LEVEL=32
# build-api-31: build-api-31:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build Docker image with Android 31 - name: Build Docker image with Android 31
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:api-31 tags: halimqarroum/docker-android:api-31
# build-args: API_LEVEL=31 build-args: API_LEVEL=31
# build-api-30: build-api-30:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build Docker image with Android 30 - name: Build Docker image with Android 30
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:api-30 tags: halimqarroum/docker-android:api-30
# build-args: API_LEVEL=30 build-args: API_LEVEL=30
# build-api-29: build-api-29:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build Docker image with Android 29 - name: Build Docker image with Android 29
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:api-29 tags: halimqarroum/docker-android:api-29
# build-args: API_LEVEL=29 build-args: API_LEVEL=29
# build-api-28: build-api-28:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build Docker image with Android 28 - name: Build Docker image with Android 28
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:api-28 tags: halimqarroum/docker-android:api-28
# build-args: | build-args: |
# "API_LEVEL=28" "API_LEVEL=28"
# "ARCHITECTURE=x86" "ARCHITECTURE=x86"
# build-api-28-playstore: build-api-28-playstore:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build Docker image with Android 28 and the PlayStore - name: Build Docker image with Android 28 and the PlayStore
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:api-28-playstore tags: halimqarroum/docker-android:api-28-playstore
# build-args: | build-args: |
# "API_LEVEL=28" "API_LEVEL=28"
# "ARCHITECTURE=x86" "ARCHITECTURE=x86"
# "IMG_TYPE=google_apis_playstore" "IMG_TYPE=google_apis_playstore"
# build-minimal: build-minimal:
# runs-on: ubuntu-latest runs-on: ubuntu-latest
# steps: steps:
# - name: Login to Docker Hub - name: Login to Docker Hub
# uses: docker/login-action@v2 uses: docker/login-action@v2
# with: with:
# username: ${{ secrets.DOCKER_HUB_USERNAME }} username: ${{ secrets.DOCKER_HUB_USERNAME }}
# password: ${{ secrets.DOCKER_HUB_TOKEN }} password: ${{ secrets.DOCKER_HUB_TOKEN }}
# - name: Build minimal Docker image - name: Build minimal Docker image
# uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
# with: with:
# push: true push: true
# tags: halimqarroum/docker-android:minimal tags: halimqarroum/docker-android:minimal
# build-args: INSTALL_ANDROID_SDK=0 build-args: INSTALL_ANDROID_SDK=0
Dockerfile
+12 -13
View File
@@ -1,4 +1,4 @@
FROM adoptopenjdk/openjdk11:jre FROM adoptopenjdk/openjdk11:alpine-jre
# Docker labels. # Docker labels.
LABEL maintainer "Halim Qarroum <hqm.post@gmail.com>" LABEL maintainer "Halim Qarroum <hqm.post@gmail.com>"
@@ -10,24 +10,23 @@ LABEL version "1.0.0"
COPY deps/redir/redir.c /usr/src/redir.c COPY deps/redir/redir.c /usr/src/redir.c
# Installing required packages. # Installing required packages.
RUN apt update --yes && \ RUN apk update && \
apt upgrade --yes && \ apk upgrade && \
apt install --yes \ apk add --no-cache \
build-essential \ alpine-sdk \
bash \ bash \
unzip \ unzip \
wget \ wget \
libvirt-daemon-system \ libvirt-daemon \
libvirt-clients \ dbus \
bridge-utils && \ polkit \
virt-manager && \
# Compile `redir`. # Compile `redir`.
gcc /usr/src/redir.c -o /usr/bin/redir && \ gcc /usr/src/redir.c -o /usr/bin/redir && \
strip /usr/bin/redir && \ strip /usr/bin/redir && \
# Cleanup APT. # Cleanup APK.
apt remove build-essential --yes && \ apk del alpine-sdk && \
apt clean autoclean --yes && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/cache/apk/*
apt autoremove --yes && \
rm -rf /var/lib/{apt,dpkg,cache,log}/
# Arguments that can be overriden at build-time. # Arguments that can be overriden at build-time.
ARG INSTALL_ANDROID_SDK=1 ARG INSTALL_ANDROID_SDK=1