remove my nr, add nrr. removes jq

README.md

@@ -67,8 +67,8 @@ Versions 22 of node.
 ### [aburgess/node:22-npm](https://hub.docker.com/r/aburgess/node)
 
 Base image: aburgess/node:22  
-Includes the latest version of npm, yarn, pnpm, and jq.  
-Also includes [@adamburges/nr](https://www.npmjs.com/package/@adamburgess/nr).  
+Includes the latest version of npm, yarn, pnpm.  
+Also includes [nrr](https://github.com/ryanccn/nrr).  
 Generally you build on this image, then have a final stage on the other image.
 
 ### [aburgess/jpegxl](https://hub.docker.com/r/aburgess/jpegxl)

dockerfiles/node.20-npm.Dockerfile

@@ -1,3 +1,14 @@
+from aburgess/common:latest as nrr
+
+run apk add --no-cache unzip
+
+arg TARGETARCH
+arg NRR_VERSION=v0.9.2
+arg NRR_PREFIX=https://github.com/ryanccn/nrr/releases/download/${NRR_VERSION}/nrr-
+arg NRR_SUFFIX=-unknown-linux-musl.zip
+
+run [ $TARGETARCH == "arm64" ] && TARGETARCH="aarch64" || TARGETARCH="x86_64"; wget -q --no-hsts $NRR_PREFIX$TARGETARCH$NRR_SUFFIX; unzip -j nrr*.zip; rm nrr*.zip
+
 from aburgess/node:20
 
-run apk add --no-cache npm git jq && npm install -g npm && npm install -g yarn pnpm @adamburgess/nr && pnpm config set script-shell /bin/bash
+run --mount=from=nrr,source=/nrr,target=/nrr apk add --no-cache git && npm install -g npm && npm install -g pnpm && pnpm config set script-shell /bin/bash && cp /nrr /usr/bin/nrr && alias nr=nrr

dockerfiles/node.22-npm.Dockerfile

@@ -1,3 +1,14 @@
+from aburgess/common:latest as nrr
+
+run apk add --no-cache unzip
+
+arg TARGETARCH
+arg NRR_VERSION=v0.9.2
+arg NRR_PREFIX=https://github.com/ryanccn/nrr/releases/download/${NRR_VERSION}/nrr-
+arg NRR_SUFFIX=-unknown-linux-musl.zip
+
+run [ $TARGETARCH == "arm64" ] && TARGETARCH="aarch64" || TARGETARCH="x86_64"; wget -q --no-hsts $NRR_PREFIX$TARGETARCH$NRR_SUFFIX; unzip -j nrr*.zip; rm nrr*.zip
+
 from aburgess/node:22
 
-run apk add --no-cache git jq && npm install -g npm && npm install -g pnpm @adamburgess/nr && pnpm config set script-shell /bin/bash
+run --mount=from=nrr,source=/nrr,target=/nrr apk add --no-cache git && npm install -g npm && npm install -g pnpm && pnpm config set script-shell /bin/bash && cp /nrr /usr/bin/nrr && alias nr=nrr

images.yml

@@ -33,8 +33,8 @@ node:20-npm:
   inputs:
     - node:20
   alpine:
-    '3.20': npm git jq
-  npm: npm yarn pnpm @adamburgess/nr
+    '3.20': npm git
+  npm: npm yarn pnpm
 node:22:
   inputs:
     - common:latest
@@ -46,8 +46,8 @@ node:22-npm:
   inputs:
     - node:22
   alpine:
-    '3.20': npm git jq
-  npm: npm pnpm @adamburgess/nr
+    '3.20': npm git
+  npm: npm pnpm
 bun:latest:
   dockers:
     - library/ubuntu:24.04