Skip to content

Commit

Permalink
chore(node): upgrade to Node LTS 20.18.0 (#1784)
Browse files Browse the repository at this point in the history
  • Loading branch information
ggrossetie authored Oct 21, 2024
1 parent 20af772 commit 2714296
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 24 deletions.
2 changes: 1 addition & 1 deletion bpmn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
2 changes: 1 addition & 1 deletion bytefield/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
3 changes: 3 additions & 0 deletions dbml/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,8 @@
},
"devDependencies": {
"standard": "17.1.0"
},
"volta": {
"node": "20.18.0"
}
}
2 changes: 1 addition & 1 deletion diagrams.net/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
2 changes: 1 addition & 1 deletion excalidraw/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
2 changes: 1 addition & 1 deletion mermaid/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
2 changes: 1 addition & 1 deletion nomnoml/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
32 changes: 16 additions & 16 deletions server/ops/docker/jdk17-noble/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# syntax=docker/dockerfile:1.4

## Nomnoml
FROM --platform=$BUILDPLATFORM node:18.20-bullseye-slim AS kroki-builder-nomnoml
FROM --platform=$BUILDPLATFORM node:20.18-bullseye-slim AS kroki-builder-nomnoml

RUN npm install -g pkg@5.8.1 [email protected].2
RUN npm install -g @yao-pkg/pkg@5.16.1 @yao-pkg/pkg[email protected].16

ARG TARGETARCH
ARG TARGETOS
ENV NODE node18
ENV NODE node20
RUN /usr/local/bin/pkg-fetch -n $NODE -p $TARGETOS -a $([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH")

COPY --from=nomnoml index.js package.json package-lock.json /app/
Expand All @@ -17,7 +17,7 @@ RUN npm install --target_arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || ech
RUN /usr/local/bin/pkg --targets $NODE-$TARGETOS-$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin

## Vega
FROM --platform=$BUILDPLATFORM node:18.20-bullseye-slim AS kroki-builder-vega
FROM --platform=$BUILDPLATFORM node:20.18-bullseye-slim AS kroki-builder-vega

# System dependencies for "canvas" Node package
# https://github.com/Automattic/node-canvas#compiling
Expand All @@ -30,29 +30,29 @@ RUN apt-get update && apt-get install --no-install-recommends --yes \
librsvg2-dev && \
apt-get clean && apt-get autoremove

RUN npm install -g pkg@5.8.1 [email protected].2
RUN npm install -g @yao-pkg/pkg@5.16.1 @yao-pkg/pkg[email protected].16

ARG TARGETARCH
ARG TARGETOS
ENV NODE node18
ENV NODE node20
RUN /usr/local/bin/pkg-fetch -n $NODE -p $TARGETOS -a $([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH")

COPY --from=vega src /app/src
COPY --from=vega tests /app/tests
COPY --from=vega package.json package-lock.json /app/
WORKDIR /app

RUN npm install 2 --target_arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") --target_platform=$TARGETOS && npm run lint && npm t
RUN npm install --target_arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") --target_platform=$TARGETOS && npm run lint && npm t
RUN /usr/local/bin/pkg --targets $NODE-$TARGETOS-$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin

## DBML
FROM --platform=$BUILDPLATFORM node:18.20-bullseye-slim AS kroki-builder-dbml
FROM --platform=$BUILDPLATFORM node:20.18-bullseye-slim AS kroki-builder-dbml

RUN npm install -g pkg@5.8.1 [email protected].2
RUN npm install -g @yao-pkg/pkg@5.16.1 @yao-pkg/pkg[email protected].16

ARG TARGETARCH
ARG TARGETOS
ENV NODE node18
ENV NODE node20
RUN /usr/local/bin/pkg-fetch -n $NODE -p $TARGETOS -a $([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH")

COPY --from=dbml index.js package.json package-lock.json /app/
Expand All @@ -62,13 +62,13 @@ RUN npm install --target_arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || ech
RUN /usr/local/bin/pkg --targets $NODE-$TARGETOS-$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin

## Wavedrom
FROM --platform=$BUILDPLATFORM node:18.20-bullseye-slim AS kroki-builder-wavedrom
FROM --platform=$BUILDPLATFORM node:20.18-bullseye-slim AS kroki-builder-wavedrom

RUN npm install -g pkg@5.8.1 [email protected].2
RUN npm install -g @yao-pkg/pkg@5.16.1 @yao-pkg/pkg[email protected].16

ARG TARGETARCH
ARG TARGETOS
ENV NODE node18
ENV NODE node20
RUN /usr/local/bin/pkg-fetch -n $NODE -p $TARGETOS -a $([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH")

COPY --from=wavedrom index.js package.json package-lock.json /app/
Expand All @@ -78,13 +78,13 @@ RUN npm install --target_arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || ech
RUN /usr/local/bin/pkg --targets $NODE-$TARGETOS-$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin

## Bytefield
FROM --platform=$BUILDPLATFORM node:18.20-bullseye-slim AS kroki-builder-bytefield
FROM --platform=$BUILDPLATFORM node:20.18-bullseye-slim AS kroki-builder-bytefield

RUN npm install -g pkg@5.8.1 [email protected].2
RUN npm install -g @yao-pkg/pkg@5.16.1 @yao-pkg/pkg[email protected].16

ARG TARGETARCH
ARG TARGETOS
ENV NODE node18
ENV NODE node20
RUN /usr/local/bin/pkg-fetch -n $NODE -p $TARGETOS -a $([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH")

COPY --from=bytefield index.js package.json package-lock.json /app/
Expand Down
2 changes: 1 addition & 1 deletion vega/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@
"assets": "node_modules/canvas/build/Release/*"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}
2 changes: 1 addition & 1 deletion wavedrom/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@
"standard": "17.1.0"
},
"volta": {
"node": "18.20.2"
"node": "20.18.0"
}
}

0 comments on commit 2714296

Please sign in to comment.