feat: upgrade for 2025

Author: beevelop

.github/dependabot.yml

@@ -1,12 +1,20 @@
 version: 2
 updates:
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "daily"
-  open-pull-requests-limit: 1
-- package-ecosystem: "docker"
-  directory: "/"
-  schedule:
-    interval: "daily"
-  open-pull-requests-limit: 1
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 1
+    groups:
+      github-actions:
+        patterns:
+          - "*"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    open-pull-requests-limit: 1
+    groups:
+      docker:
+        patterns:
+          - "*"

.github/workflows/docker.yml

@@ -2,9 +2,11 @@ name: Docker Image
 
 on:
   schedule:
-    - cron: "0 13 * * *" # everyday at 1pm
+    - cron: "0 10 * * *" # everyday at 10am
+  pull_request_target:
+    branches: ["latest"]
   push:
-    branches: ["**"]
+    branches: ["latest"]
     tags: ["v*.*.*"]
 
 env:
@@ -20,30 +22,23 @@ jobs:
       - name: Set imageName based on the repository name
         id: step_one
         run: |
-            imageName="${GITHUB_REPOSITORY/docker-/}"
-            echo $imageName
-            echo "imageName=$imageName" >> $GITHUB_ENV
+          imageName="${GITHUB_REPOSITORY/docker-/}"
+          echo $imageName
+          echo "imageName=$imageName" >> $GITHUB_ENV
       - name: Docker meta
         id: docker_meta
-        uses: crazy-max/ghaction-docker-meta@v5
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.imageName }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to Harbor
+      - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Buildx cache
-        uses: actions/cache@v4
-        with:
-          path: ${{ github.workspace }}/cache
-          key: ${{ runner.os }}-docker-${{ hashfiles('cache/**') }}
-          restore-keys: |
-            ${{ runner.os }}-docker
       - name: Build and push
         id: docker_build
         uses: docker/build-push-action@v6
@@ -52,5 +47,35 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
-          # cache-from: type=local,src=${{ github.workspace }}/cache
-          # cache-to: type=local,dest=${{ github.workspace }}/cache
+      
+      - name: Docker Scout
+        id: docker-scout-cves
+        if: ${{ github.event_name != 'pull_request_target' }}
+        uses: docker/scout-action@v1
+        with:
+          command: cves
+          organization: beevelop
+          image: ${{ env.imageName }}:latest
+          to-latest: true
+          github-token: ${{ secrets.GITHUB_TOKEN }} # to be able to write the comment
+          sarif-file: sarif.output.json
+
+      - name: Upload SARIF result
+        id: upload-sarif
+        if: ${{ github.event_name != 'pull_request_target' }}
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: sarif.output.json
+
+      - name: Compare to deployed image
+        id: docker-scout-compare
+        if: ${{ github.event_name == 'pull_request_target' }}
+        uses: docker/scout-action@v1
+        with:
+          command: compare
+          organization: beevelop
+          image: ${{ steps.docker_meta.outputs.tags }}
+          only-severities: critical,high
+          platform: "linux/amd64"
+          exit-on: vulnerability,policy
+          summary: true

Dockerfile

@@ -2,7 +2,7 @@ FROM beevelop/java
 
 # https://developer.android.com/studio/#downloads
 ENV ANDROID_SDK_URL="https://dl.google.com/android/repository/commandlinetools-linux-13114758_latest.zip" \
-    ANDROID_BUILD_TOOLS_VERSION=35.0.0 \
+    ANDROID_BUILD_TOOLS_VERSION=36.0.1 \
     ANT_HOME="/usr/share/ant" \
     MAVEN_HOME="/usr/share/maven" \
     GRADLE_HOME="/usr/share/gradle" \
@@ -35,10 +35,9 @@ RUN mkdir android && cd android && \
 
 RUN mkdir /root/.android && touch /root/.android/repositories.cfg && \
     while true; do echo 'y'; sleep 2; done | sdkmanager "platform-tools" "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" && \
-    while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-31" "platforms;android-32" "platforms;android-33" && \
-    while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-34" "platforms;android-35" && \
+    while true; do echo 'y'; sleep 2; done | sdkmanager "platforms;android-33" "platforms;android-34" "platforms;android-35" "platforms;android-36" && \
     while true; do echo 'y'; sleep 2; done | sdkmanager "extras;android;m2repository" "extras;google;google_play_services" "extras;google;instantapps" "extras;google;m2repository" &&  \
-    while true; do echo 'y'; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-22" "add-ons;addon-google_apis-google-23" "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
+    while true; do echo 'y'; sleep 2; done | sdkmanager "add-ons;addon-google_apis-google-24" "skiaparser;1" "skiaparser;2" "skiaparser;3"
 
 RUN chmod a+x -R $ANDROID_SDK_ROOT && \
     chown -R root:root $ANDROID_SDK_ROOT && \

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2015-2023 Maik Hummel
+Copyright (c) 2015-2025 Maik Hummel
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -8,14 +8,15 @@
 ![CalVer](https://img.shields.io/badge/CalVer-YYYY.MM.MICRO-22bfda.svg?style=for-the-badge)
 [![Beevelop](https://img.shields.io/badge/-%20Made%20with%20%F0%9F%8D%AF%20by%20%F0%9F%90%9Dvelop-blue.svg?style=for-the-badge)](https://beevelop.com)
 
-# Android 15 (API levels 31 - 35)
+# Android 16 (API levels 33 - 36)
 
 ## based on [beevelop/java](https://github.com/beevelop/docker-java)
 
 - Java `17.0.12`
 - Gradle `8.12` (Groovy: `3.0.22`)
 - Apache Maven `3.6.3`
 - Ant `1.10.12`
+- Android Build Tools `36.0.1`
 
 ## Pull, build or run this image
 
@@ -27,7 +28,7 @@ docker pull beevelop/android:v2023.12.1
 docker run --rm --name beevelop -it beevelop/android:v2023.12.1 bash
 
 # or build the image from GitHub
-docker build -t beevelop/android github.com/beevelop/docker-base
+docker build -t beevelop/android github.com/beevelop/docker-android
 ```
 
 ## Or use it as a base image