From a3981512d2f9e368d75b97b2f80db91a97dfcff4 Mon Sep 17 00:00:00 2001 From: Ian McLinden Date: Wed, 12 Jan 2022 10:49:52 -0600 Subject: [PATCH] [FIX] arm64/arm libvips (broken sqlite build) - Downgrades python3 to python2 to support broken sqlite3 build scripts when arm/arm64 fails over to manual build - Upgrades 4/debian to bullseye for arm64 dependency compatibility --- 4/alpine/Dockerfile | 4 ++-- 4/debian/Dockerfile | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/4/alpine/Dockerfile b/4/alpine/Dockerfile index 27de9c66..b11494ad 100644 --- a/4/alpine/Dockerfile +++ b/4/alpine/Dockerfile @@ -51,9 +51,9 @@ RUN set -eux; \ sqlite3Version="$(node -p 'require("./package.json").optionalDependencies.sqlite3')"; \ if ! su-exec node yarn add "sqlite3@$sqlite3Version" --force; 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 - apk add --no-cache --virtual .build-deps g++ gcc libc-dev make python3 vips-dev; \ + apk add --no-cache --virtual .build-deps g++ gcc libc-dev make python2 vips-dev; \ \ - npm_config_python='python3' su-exec node yarn add "sqlite3@$sqlite3Version" --force --build-from-source; \ + npm_config_python='python2' su-exec node yarn add "sqlite3@$sqlite3Version" --force --build-from-source; \ \ apk del --no-network .build-deps; \ fi; \ diff --git a/4/debian/Dockerfile b/4/debian/Dockerfile index bfbc89c8..cbde2b4f 100644 --- a/4/debian/Dockerfile +++ b/4/debian/Dockerfile @@ -1,7 +1,7 @@ # https://docs.ghost.org/faq/node-versions/ # https://github.com/nodejs/Release (looking for "LTS") # https://github.com/TryGhost/Ghost/blob/v4.1.2/package.json#L38 -FROM node:14-buster-slim +FROM node:14-bullseye-slim # grab gosu for easy step-down from root # https://github.com/tianon/gosu/releases @@ -77,10 +77,10 @@ RUN set -eux; \ # 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 savedAptMark="$(apt-mark showmanual)"; \ apt-get update; \ - apt-get install -y --no-install-recommends g++ gcc libc-dev libvips-dev make python3; \ + apt-get install -y --no-install-recommends g++ gcc libc-dev libvips-dev make python2; \ rm -rf /var/lib/apt/lists/*; \ \ - npm_config_python='python3' gosu node yarn add "sqlite3@$sqlite3Version" --force --build-from-source --ignore-optional; \ + npm_config_python='python2' gosu node yarn add "sqlite3@$sqlite3Version" --force --build-from-source --ignore-optional; \ \ apt-mark showmanual | xargs apt-mark auto > /dev/null; \ [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \