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

"update alpine base image and fdroid tools to latest versions" #1

Open
pcaseiro wants to merge 3 commits from feat-update-fdroid into master
pull from: feat-update-fdroid
merge into: Cadoles:master
Conversation 0 Commits 3 Files Changed 4 +73 -13
4 changed files with 73 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 40902f8729 - Show all commits

6
Dockerfile
View File

@ -21,6 +21,8 @@ FROM reg.cadoles.com/proxy_cache/library/alpine:3.22 as runtime
ARG TIMEZONE=Europe/Paris
RUN apk update && apk upgrade
RUN apk add --no-cache \
python3 openjdk8 java-common \
bash supervisor openssh inotify-tools gettext \
@ -36,8 +38,8 @@ RUN mkdir -p /opt/android \
ENV ANDROID_HOME="/opt/android"
ENV PATH="$PATH:$ANDROID_HOME/tools/bin"
RUN yes | sdkmanager "build-tools;34.0.0"
ENV PATH="$PATH:$ANDROID_HOME/build-tools/34.0.0"
RUN yes | sdkmanager "build-tools;36.0.0"
ENV PATH="$PATH:$ANDROID_HOME/build-tools/36.0.0"
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" \
fdroid-repository:latest \
$(DOCKER_CMD)
scan:
trivy image --format table fdroid-repository:latest
release:
docker image tag fdroid-repository:latest reg.cadoles.com/cadoles/fdroid-repository:latest