Cadoles/fdroid-repository
21
0
Fork 0
Code Issues Pull Requests 1 Actions Projects Releases Wiki Activity

feat(docker): updating android build-tools to version 36
All checks were successful
Build and Push Image / Build and push image (push) Successful in 24m39s
Details

Browse Source
This commit is contained in:
Philippe Caseiro
2025-07-02 09:33:58 +02:00
parent 3c86622b50
commit 40902f8729
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -21,6 +21,8 @@ FROM reg.cadoles.com/proxy_cache/library/alpine:3.22 as runtime
ARG TIMEZONE=Europe/Paris ARG TIMEZONE=Europe/Paris
RUN apk update && apk upgrade
RUN apk add --no-cache \ RUN apk add --no-cache \
python3 openjdk8 java-common \ python3 openjdk8 java-common \
bash supervisor openssh inotify-tools gettext \ bash supervisor openssh inotify-tools gettext \
@ -36,8 +38,8 @@ RUN mkdir -p /opt/android \
ENV ANDROID_HOME="/opt/android" ENV ANDROID_HOME="/opt/android"
ENV PATH="$PATH:$ANDROID_HOME/tools/bin" ENV PATH="$PATH:$ANDROID_HOME/tools/bin"
RUN yes | sdkmanager "build-tools;34.0.0" RUN yes | sdkmanager "build-tools;36.0.0"
ENV PATH="$PATH:$ANDROID_HOME/build-tools/34.0.0" ENV PATH="$PATH:$ANDROID_HOME/build-tools/36.0.0"
COPY --from=build /fdroid /fdroid COPY --from=build /fdroid /fdroid

2
Makefile
View File

@ -27,6 +27,8 @@ run:
-e "FDROID_KEYSTORE_DNAME=CN=cadoles.com, OU=ID, O=Cadoles, L=Dijon, S=France, C=FR" \ -e "FDROID_KEYSTORE_DNAME=CN=cadoles.com, OU=ID, O=Cadoles, L=Dijon, S=France, C=FR" \
fdroid-repository:latest \ fdroid-repository:latest \
$(DOCKER_CMD) $(DOCKER_CMD)
scan:
trivy image --format table fdroid-repository:latest
release: release:
docker image tag fdroid-repository:latest reg.cadoles.com/cadoles/fdroid-repository:latest docker image tag fdroid-repository:latest reg.cadoles.com/cadoles/fdroid-repository:latest