From 66764d84c25b4c8a9a43e636a2e9b0de3b30a567 Mon Sep 17 00:00:00 2001
From: Maik Hummel <6891349+beevelop@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:30:24 +0200
Subject: [PATCH 1/2] fix: install latest npm version for node 22 (#348)

* fix: install latest npm version for node 22

* fix: docker build configuration
---
 .github/workflows/docker.yml | 5 ++++-
 Dockerfile                   | 9 +++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bc43815..81cb0ca 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,7 +4,7 @@ on:
   schedule:
     - cron: "0 10 * * *" # everyday at 10am
   workflow_dispatch:
-  pull_request_target:
+  pull_request:
     branches: ["latest"]
   push:
     branches: ["latest"]
@@ -20,6 +20,8 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v5
+        with:
+          ref: ${{ github.head_ref || github.ref }}
       - name: Set imageName based on the repository name
         id: step_one
         run: |
@@ -46,5 +48,6 @@ jobs:
         with:
           platforms: ${{ env.platforms }}
           push: ${{ github.event_name != 'pull_request' }}
+          pull: true
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index e4bc722..122a7d9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,10 +18,11 @@ LABEL maintainer="hi@beevelop.com" \
       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 && \
+# Install Node.js 22 with compatible npm using official Node.js binaries
+ENV NODE_VERSION=22.18.0
+RUN apt-get update && apt-get install -y curl ca-certificates xz-utils && \
+    curl -fsSL https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz | tar -xJ -C /usr/local --strip-components=1 && \
+    npm install -g npm@latest && \
     npm install -g yarn && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \

From 9fbb1828a7c654c1195255797fbb3001450a0956 Mon Sep 17 00:00:00 2001
From: Maik Hummel <6891349+beevelop@users.noreply.github.com>
Date: Fri, 22 Aug 2025 13:31:01 +0200
Subject: [PATCH 2/2] chore(release): update README to v2025.08.3

- Update beevelop/android-nodejs version references
- Prepare for v2025.08.3 release
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 51cbbc6..f57e37c 100644
--- a/README.md
+++ b/README.md
@@ -23,10 +23,10 @@
 
 ```bash
 # pull the most recent tag / release
-docker pull beevelop/android-nodejs:v2025.08.2
+docker pull beevelop/android-nodejs:v2025.08.3
 
 # or run the image interactively
-docker run --rm --name beevelop -it beevelop/android-nodejs:v2025.08.2 bash
+docker run --rm --name beevelop -it beevelop/android-nodejs:v2025.08.3 bash
 
 # or build the image from GitHub
 docker build -t beevelop/android-nodejs github.com/beevelop/docker-android-nodejs
@@ -35,7 +35,7 @@ docker build -t beevelop/android-nodejs github.com/beevelop/docker-android-nodej
 ### Or use it as a base image
 
 ```Dockerfile
-FROM beevelop/android-nodejs:v2025.08.2
+FROM beevelop/android-nodejs:v2025.08.3
 ```
 
 ---