From 71da6d5ac939a5d9e96abc011cb850f74ce43732 Mon Sep 17 00:00:00 2001 From: Guillaume Grossetie Date: Thu, 2 Nov 2023 14:25:51 +0000 Subject: [PATCH] Update Docker images --- bpmn/Dockerfile | 2 +- diagrams.net/Dockerfile | 2 +- excalidraw/Dockerfile | 2 +- mermaid/Dockerfile | 2 +- server/ops/docker/jdk11-jammy/Dockerfile | 12 ++++++------ 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bpmn/Dockerfile b/bpmn/Dockerfile index ae5be8d9c..7423e14f1 100644 --- a/bpmn/Dockerfile +++ b/bpmn/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.17-alpine3.18 +FROM node:18.18-alpine3.18 RUN addgroup -g 1001 kroki && adduser -D -G kroki -u 1001 kroki diff --git a/diagrams.net/Dockerfile b/diagrams.net/Dockerfile index ea067aed2..9b200c733 100644 --- a/diagrams.net/Dockerfile +++ b/diagrams.net/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.17-alpine3.18 +FROM node:18.18-alpine3.18 RUN addgroup -g 1001 kroki && adduser -D -G kroki -u 1001 kroki diff --git a/excalidraw/Dockerfile b/excalidraw/Dockerfile index 854881014..ba32d439b 100644 --- a/excalidraw/Dockerfile +++ b/excalidraw/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.17-alpine3.18 +FROM node:18.18-alpine3.18 RUN addgroup -g 1001 kroki && adduser -D -G kroki -u 1001 kroki diff --git a/mermaid/Dockerfile b/mermaid/Dockerfile index e53bbb0a2..957f1b015 100644 --- a/mermaid/Dockerfile +++ b/mermaid/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.17-alpine3.18 +FROM node:18.18-alpine3.18 RUN addgroup -g 1001 kroki && adduser -D -G kroki -u 1001 kroki diff --git a/server/ops/docker/jdk11-jammy/Dockerfile b/server/ops/docker/jdk11-jammy/Dockerfile index fd666bc22..ea0c31cff 100644 --- a/server/ops/docker/jdk11-jammy/Dockerfile +++ b/server/ops/docker/jdk11-jammy/Dockerfile @@ -37,7 +37,7 @@ RUN curl -LO https://github.com/mgieseki/dvisvgm/releases/download/$DVISVGM_VERS make install ## Nomnoml -FROM --platform=$BUILDPLATFORM node:18.17-bullseye-slim AS kroki-builder-nomnoml +FROM --platform=$BUILDPLATFORM node:18.18-bullseye-slim AS kroki-builder-nomnoml RUN npm install -g pkg@5.8.1 pkg-fetch@3.5.2 @@ -53,7 +53,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.17-bullseye-slim AS kroki-builder-vega +FROM --platform=$BUILDPLATFORM node:18.18-bullseye-slim AS kroki-builder-vega # System dependencies for "canvas" Node package # https://github.com/Automattic/node-canvas#compiling @@ -82,7 +82,7 @@ RUN npm install 2 --target_arch=$([ "$TARGETARCH" = "amd64" ] && echo "x64" || e RUN /usr/local/bin/pkg --targets $NODE-$TARGETOS-$([ "$TARGETARCH" = "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin ## DBML -FROM --platform=$BUILDPLATFORM node:18.17-bullseye-slim AS kroki-builder-dbml +FROM --platform=$BUILDPLATFORM node:18.18-bullseye-slim AS kroki-builder-dbml RUN npm install -g pkg@5.8.1 pkg-fetch@3.5.2 @@ -98,7 +98,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 ## Wavedrom -FROM --platform=$BUILDPLATFORM node:18.17-bullseye-slim AS kroki-builder-wavedrom +FROM --platform=$BUILDPLATFORM node:18.18-bullseye-slim AS kroki-builder-wavedrom RUN npm install -g pkg@5.8.1 pkg-fetch@3.5.2 @@ -114,7 +114,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 ## Bytefield -FROM --platform=$BUILDPLATFORM node:18.17-bullseye-slim AS kroki-builder-bytefield +FROM --platform=$BUILDPLATFORM node:18.18-bullseye-slim AS kroki-builder-bytefield RUN npm install -g pkg@5.8.1 pkg-fetch@3.5.2 @@ -201,7 +201,7 @@ RUN wget -q "https://pikchr.org/home/raw/${PIKCHR_VERSION}" -O pikchr.c RUN gcc -O0 -g -static -Wall -Wextra -DPIKCHR_SHELL pikchr.c -o pikchr -lm ## SVGBob -FROM --platform=$BUILDPLATFORM rust:1.72-slim-bullseye AS kroki-builder-static-svgbob +FROM --platform=$BUILDPLATFORM rust:1.73-slim-bullseye AS kroki-builder-static-svgbob # Install cross-compilation tools RUN apt-get update && apt-get install --no-install-recommends --yes \