feat: update for 2025

Author: beevelop

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - 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 14 * * *" # everyday at 2pm
+    - cron: "0 10 * * *" # everyday at 10am
+  pull_request_target:
+    branches: ["latest"]
   push:
-    branches: ["**"]
+    branches: ["latest"]
     tags: ["v*.*.*"]
 
 env:
@@ -16,30 +18,30 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Check out the repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
       - 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: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.imageName }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         id: docker_build
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           platforms: ${{ env.platforms }}
           push: ${{ github.event_name != 'pull_request' }}

Dockerfile

@@ -1,13 +1,27 @@
 FROM beevelop/android
 
-RUN apt-get update && apt-get install -y curl gnupg2 lsb-release && \
-    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
-    apt-key fingerprint 1655A0AB68576280 && \
-    export VERSION=node_18.x && \
-    export DISTRO="$(lsb_release -s -c)" && \
-    echo "deb https://deb.nodesource.com/$VERSION $DISTRO main" | tee /etc/apt/sources.list.d/nodesource.list && \
-    echo "deb-src https://deb.nodesource.com/$VERSION $DISTRO main" | tee -a /etc/apt/sources.list.d/nodesource.list && \
-    apt-get update && apt-get install -y nodejs && \
+LABEL maintainer="[email protected]" \
+      org.label-schema.schema-version="1.0" \
+      org.label-schema.name="Beevelop Android + Node.js Image" \
+      org.label-schema.description="Android SDK with Node.js, npm, and yarn - based on beevelop/android." \
+      org.label-schema.vendor="Maik Hummel (beevelop)" \
+      org.label-schema.url="https://github.com/beevelop/docker-android-nodejs" \
+      org.label-schema.usage="https://github.com/beevelop/docker-android-nodejs/blob/latest/README.md" \
+      org.label-schema.vcs-url="https://github.com/beevelop/docker-android-nodejs.git" \
+      org.label-schema.license="MIT" \
+      org.opencontainers.image.title="Beevelop Android + Node.js Image" \
+      org.opencontainers.image.description="Android SDK with Node.js, npm, and yarn - based on beevelop/android." \
+      org.opencontainers.image.licenses="MIT" \
+      org.opencontainers.image.authors="Maik Hummel (beevelop)" \
+      org.opencontainers.image.vendor="Maik Hummel (beevelop)" \
+      org.opencontainers.image.url="https://github.com/beevelop/docker-android-nodejs" \
+      org.opencontainers.image.documentation="https://github.com/beevelop/docker-android-nodejs/blob/latest/README.md" \
+      org.opencontainers.image.source="https://github.com/beevelop/docker-android-nodejs.git"
+
+# Install Node.js using NodeSource repository
+RUN apt-get update && apt-get install -y curl ca-certificates && \
+    curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \
+    apt-get install -y nodejs && \
     node -v && npm -v && \
     npm install -g yarn && \
     yarn -v && \

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016-2023 Maik Hummel (beevelop)
+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,7 +8,7 @@
 ![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 13 with Node.js `v18` and npm / yarn
+# Android with Node.js LTS and npm / yarn
 
 ### based on [beevelop/android](https://github.com/beevelop/docker-android)
 
@@ -29,7 +29,7 @@ docker pull beevelop/android-nodejs:v2023.10.1
 docker run --rm --name beevelop -it beevelop/android-nodejs:v2023.10.1 bash
 
 # or build the image from GitHub
-docker build -t beevelop/android-nodejs github.com/beevelop/docker-base
+docker build -t beevelop/android-nodejs github.com/beevelop/docker-android-nodejs
 ```
 
 ### Or use it as a base image