From fb433ddb56312c043bc1cfc52a2305b28c290b93 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Fri, 28 Feb 2025 00:07:45 -0600 Subject: Update asset generation (partially). --- assets/css/compile.sh | 2 +- assets/images/polyguin.sh | 4 ++-- publish | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/assets/css/compile.sh b/assets/css/compile.sh index 66d79de..34b63f3 100755 --- a/assets/css/compile.sh +++ b/assets/css/compile.sh @@ -1,7 +1,7 @@ #!/bin/sh -e HERE=$(dirname $(readlink -f ${0})); -NODE=23.0.0-alpine3.19; # https://hub.docker.com/_/node +NODE=23.9.0-alpine3.21; # https://hub.docker.com/_/node cd ${HERE}; diff --git a/assets/images/polyguin.sh b/assets/images/polyguin.sh index dc974f5..7b4a7fa 100755 --- a/assets/images/polyguin.sh +++ b/assets/images/polyguin.sh @@ -88,8 +88,8 @@ grep fill: polyguin.svg \ #=============================================================== -docker run -v$(pwd):/x -w/x --rm -i alpine:3.17 <<'EOF' -apk add graphicsmagick imagemagick; +docker run -v$(pwd):/x -w/x --rm -i alpine:3.21 <<'EOF' +apk add graphicsmagick imagemagick imagemagick-svg; #=============================================================== #--------------------------------------------------------------- diff --git a/publish b/publish index a3fe673..d65d2b3 100755 --- a/publish +++ b/publish @@ -37,7 +37,9 @@ fi # LOGO if test ${HTML} -eq 1; then #=============================================================== -docker run -v ${HERE}:${HERE} -e HERE=${HERE} -v ${TEMP}:${TEMP} -e TEMP=${TEMP} --rm -i alpine:3.17 <<'EOF' +# FIXME: cannot update to 3.19 (or newer) else PSD images break; +# missing PSD coder support? Alpine needs subpackge maybe?? +docker run -v ${HERE}:${HERE} -e HERE=${HERE} -v ${TEMP}:${TEMP} -e TEMP=${TEMP} --rm -i alpine:3.18 <<'EOF' apk add findutils imagemagick; #=============================================================== @@ -47,7 +49,7 @@ apk add findutils imagemagick; find ${HERE} -type f -name "*.psd" | while read k; do f="${k#*${HERE}}"; mkdir -p "${TEMP}${f%/*}"; - convert "${k}[0]" -strip "${TEMP}${f%*.psd}.jpg"; + magick "${k}[0]" -strip "${TEMP}${f%*.psd}.jpg"; done ## -- cgit v1.2.3-70-g09d2