From 1e337a7924ecc68c6606b1abe45f8014650f31b5 Mon Sep 17 00:00:00 2001 From: Guillaume Grossetie Date: Thu, 6 Apr 2023 02:23:13 +0000 Subject: [PATCH] Update Docker images --- blockdiag/Dockerfile | 2 +- bpmn/Dockerfile | 4 ++-- diagrams.net/Dockerfile | 4 ++-- excalidraw/Dockerfile | 4 ++-- mermaid/Dockerfile | 2 +- server/ops/docker/jdk11-jammy/Dockerfile | 14 +++++++------- wireviz/Dockerfile | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/blockdiag/Dockerfile b/blockdiag/Dockerfile index 066bb3ce8..8da78362c 100644 --- a/blockdiag/Dockerfile +++ b/blockdiag/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.0-alpine3.16 +FROM python:3.11.3-alpine3.16 RUN addgroup -g 1000 kroki && adduser -D -G kroki -u 1000 kroki diff --git a/bpmn/Dockerfile b/bpmn/Dockerfile index 260e56dbb..6a40e9176 100644 --- a/bpmn/Dockerfile +++ b/bpmn/Dockerfile @@ -1,5 +1,5 @@ # Package the Node.js project into a single binary -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.18.1-alpine3.16 as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.20.0-alpine3.16 as builder # Workaround: https://github.com/nodejs/docker-node/issues/813#issuecomment-407339011 # Error: could not get uid/gid @@ -22,7 +22,7 @@ RUN npm run lint RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM}-$([ "$TARGETARCH" == "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin # Create the image -FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.16.3 +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.17.3 RUN addgroup -g 1000 kroki && adduser -D -G kroki -u 1000 kroki diff --git a/diagrams.net/Dockerfile b/diagrams.net/Dockerfile index 0fd952355..55dd4777c 100644 --- a/diagrams.net/Dockerfile +++ b/diagrams.net/Dockerfile @@ -1,5 +1,5 @@ # Package the Node.js project into a single binary -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.18.1-alpine3.16 as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.20.0-alpine3.16 as builder # Workaround: https://github.com/nodejs/docker-node/issues/813#issuecomment-407339011 # Error: could not get uid/gid @@ -22,7 +22,7 @@ RUN npm run lint RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM}-$([ "$TARGETARCH" == "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin # Create the image -FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.16.3 +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.17.3 RUN addgroup -g 1000 kroki && adduser -D -G kroki -u 1000 kroki diff --git a/excalidraw/Dockerfile b/excalidraw/Dockerfile index 5e0b7abeb..de7e7f239 100644 --- a/excalidraw/Dockerfile +++ b/excalidraw/Dockerfile @@ -1,5 +1,5 @@ # Package the Node.js project into a single binary -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.18.1-alpine3.16 as builder +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.20.0-alpine3.16 as builder # Workaround: https://github.com/nodejs/docker-node/issues/813#issuecomment-407339011 # Error: could not get uid/gid @@ -24,7 +24,7 @@ RUN npm run prestart RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM}-$([ "$TARGETARCH" == "amd64" ] && echo "x64" || echo "$TARGETARCH") . -o app.bin # Create the image -FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.16.3 +FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.17.3 RUN addgroup -g 1000 kroki && adduser -D -G kroki -u 1000 kroki diff --git a/mermaid/Dockerfile b/mermaid/Dockerfile index 540b0b5d5..c15b9cdb1 100644 --- a/mermaid/Dockerfile +++ b/mermaid/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.18-alpine3.16 +FROM --platform=${TARGETPLATFORM:-linux/amd64} node:16.20-alpine3.16 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 4a4c1f091..1f36f5678 100644 --- a/server/ops/docker/jdk11-jammy/Dockerfile +++ b/server/ops/docker/jdk11-jammy/Dockerfile @@ -26,7 +26,7 @@ RUN \ && make install ## D2 -FROM golang:1.19.3-bullseye AS kroki-builder-d2 +FROM golang:1.20.3-bullseye AS kroki-builder-d2 COPY ops/docker/go.mod . RUN D2_VERSION=`cat go.mod | grep "oss.terrastruct.com/d2" | cut -d' ' -f3` \ @@ -34,7 +34,7 @@ RUN D2_VERSION=`cat go.mod | grep "oss.terrastruct.com/d2" | cut -d' ' -f3` \ && go install "oss.terrastruct.com/d2@${D2_VERSION}" ## Nomnoml -FROM node:16.18.1-bullseye-slim AS kroki-builder-nomnoml +FROM node:16.20.0-bullseye-slim AS kroki-builder-nomnoml RUN npm install -g pkg@5.6.0 pkg-fetch@3.3.0 @@ -50,7 +50,7 @@ RUN npm run lint RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM} . -o app.bin ## Vega -FROM node:16.18.1-bullseye-slim AS kroki-builder-vega +FROM node:16.20.0-bullseye-slim AS kroki-builder-vega # System dependencies for "canvas" Node package # https://github.com/Automattic/node-canvas#compiling @@ -79,7 +79,7 @@ RUN npm run lint && npm t RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM} . -o app.bin ## DBML -FROM node:16.18.1-bullseye-slim AS kroki-builder-dbml +FROM node:16.20.0-bullseye-slim AS kroki-builder-dbml RUN npm config set unsafe-perm true @@ -97,7 +97,7 @@ RUN npm run lint RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM} . -o app.bin ## Wavedrom -FROM node:16.18.1-bullseye-slim AS kroki-builder-wavedrom +FROM node:16.20.0-bullseye-slim AS kroki-builder-wavedrom RUN npm install -g pkg@5.6.0 pkg-fetch@3.3.0 @@ -113,7 +113,7 @@ RUN npm run lint RUN /usr/local/bin/pkg --targets ${NODE}-${PLATFORM} . -o app.bin ## Bytefield -FROM node:16.18.1-bullseye-slim AS kroki-builder-bytefield +FROM node:16.20.0-bullseye-slim AS kroki-builder-bytefield RUN npm install -g pkg@5.6.0 pkg-fetch@3.3.0 @@ -170,7 +170,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 rust:1.65-slim-bullseye AS kroki-builder-static-svgbob +FROM rust:1.68-slim-bullseye AS kroki-builder-static-svgbob RUN rustup target add x86_64-unknown-linux-musl COPY ops/docker/Cargo.toml . diff --git a/wireviz/Dockerfile b/wireviz/Dockerfile index e48ec9144..f25f769ef 100644 --- a/wireviz/Dockerfile +++ b/wireviz/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11.0-alpine3.16 +FROM python:3.11.3-alpine3.16 RUN addgroup -g 1000 kroki && adduser -D -G kroki -u 1000 kroki