diff --git a/Dockerfile b/Dockerfile index a04b34f..e8af5ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 diff --git a/Makefile b/Makefile index d6c25ea..99913ca 100644 --- a/Makefile +++ b/Makefile @@ -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