From a3a609e8e746951cb0ce25e34eff3fd84e56b300 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Georger?= Date: Thu, 9 May 2024 04:36:48 -0400 Subject: [PATCH 1/2] Node 20 (Iron) and libvips-dev I'm curious if this works here, ref: https://github.com/TryGhost/Ghost/issues/20065 --- 5/debian/Dockerfile | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/5/debian/Dockerfile b/5/debian/Dockerfile index ce0d1805..6d5bc36d 100644 --- a/5/debian/Dockerfile +++ b/5/debian/Dockerfile @@ -1,6 +1,6 @@ # https://docs.ghost.org/faq/node-versions/ # https://github.com/nodejs/Release (looking for "LTS") -FROM node:18-bookworm-slim +FROM node:iron-bookworm-slim # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases @@ -43,7 +43,7 @@ RUN set -eux; \ ENV GHOST_INSTALL /var/lib/ghost ENV GHOST_CONTENT /var/lib/ghost/content -ENV GHOST_VERSION 5.82.2 +ENV GHOST_VERSION 5.82.8 RUN set -eux; \ mkdir -p "$GHOST_INSTALL"; \ @@ -55,8 +55,8 @@ RUN set -eux; \ installCmd='gosu node ghost install "$GHOST_VERSION" --db mysql --dbhost mysql --no-prompt --no-stack --no-setup --dir "$GHOST_INSTALL"'; \ if ! eval "$installCmd"; then \ aptPurge=1; \ - apt-get update; \ - apt-get install -y --no-install-recommends g++ make python3; \ + apt update; \ + apt install -y --no-install-recommends --no-install-suggests libvips-dev g++ make python3 ; \ eval "$installCmd"; \ fi; \ \ @@ -94,11 +94,12 @@ RUN set -eux; \ if ! eval "$installCmd"; then \ # must be some non-amd64 architecture pre-built binaries aren't published for, so let's install some build deps and do-it-all-over-again aptPurge=1; \ - apt-get update; \ - apt-get install -y --no-install-recommends g++ make python3; \ + apt update; \ + apt install -y --no-install-recommends g++ make python3; \ case "$package" in \ - # TODO sharp@*) apt-get install -y --no-install-recommends libvips-dev ;; \ - sharp@*) echo >&2 "sorry: libvips 8.10 in Debian bullseye is not new enough (8.12.2+) for sharp 0.30 ๐Ÿ˜ž"; continue ;; \ + # Debian Bookworm is capable now ๐Ÿ˜„ + sharp@*) apt install -y --no-install-recommends --no-install-suggests libvips-dev ;; \ + # sharp@*) echo >&2 "sorry: libvips 8.10 in Debian bullseye is not new enough (8.12.2+) for sharp 0.30 ๐Ÿ˜ž"; continue ;; \ esac; \ \ eval "$installCmd --build-from-source"; \ @@ -108,7 +109,7 @@ RUN set -eux; \ if [ -n "$aptPurge" ]; then \ apt-mark showmanual | xargs apt-mark auto > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \ - apt-get purge -y --auto-remove; \ + apt purge -y --auto-remove; \ rm -rf /var/lib/apt/lists/*; \ fi; \ \ From 42c065cb14a6af3f378bfab77a3e93d739c4e7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Georger?= Date: Thu, 16 May 2024 06:06:10 -0400 Subject: [PATCH 2/2] Update Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nicolรกs Georger --- 5/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/5/debian/Dockerfile b/5/debian/Dockerfile index 6d5bc36d..d40753c8 100644 --- a/5/debian/Dockerfile +++ b/5/debian/Dockerfile @@ -43,7 +43,7 @@ RUN set -eux; \ ENV GHOST_INSTALL /var/lib/ghost ENV GHOST_CONTENT /var/lib/ghost/content -ENV GHOST_VERSION 5.82.8 +ENV GHOST_VERSION 5.82.10 RUN set -eux; \ mkdir -p "$GHOST_INSTALL"; \