Skip to content

Commit ae48809

Browse files
authored
Merge pull request #281 from ianmclinden/fix-arm-arm64-sharp
[FIX] arm64 libvips (broken sqlite build)
2 parents 7a6df53 + a398151 commit ae48809

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

4/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ RUN set -eux; \
5151
sqlite3Version="$(node -p 'require("./package.json").optionalDependencies.sqlite3')"; \
5252
if ! su-exec node yarn add "sqlite3@$sqlite3Version" --force; then \
5353
# 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
54-
apk add --no-cache --virtual .build-deps g++ gcc libc-dev make python3 vips-dev; \
54+
apk add --no-cache --virtual .build-deps g++ gcc libc-dev make python2 vips-dev; \
5555
\
56-
npm_config_python='python3' su-exec node yarn add "sqlite3@$sqlite3Version" --force --build-from-source; \
56+
npm_config_python='python2' su-exec node yarn add "sqlite3@$sqlite3Version" --force --build-from-source; \
5757
\
5858
apk del --no-network .build-deps; \
5959
fi; \

4/debian/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://docs.ghost.org/faq/node-versions/
22
# https://github.com/nodejs/Release (looking for "LTS")
33
# https://github.com/TryGhost/Ghost/blob/v4.1.2/package.json#L38
4-
FROM node:14-buster-slim
4+
FROM node:14-bullseye-slim
55

66
# grab gosu for easy step-down from root
77
# https://github.com/tianon/gosu/releases
@@ -77,10 +77,10 @@ RUN set -eux; \
7777
# 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
7878
savedAptMark="$(apt-mark showmanual)"; \
7979
apt-get update; \
80-
apt-get install -y --no-install-recommends g++ gcc libc-dev libvips-dev make python3; \
80+
apt-get install -y --no-install-recommends g++ gcc libc-dev libvips-dev make python2; \
8181
rm -rf /var/lib/apt/lists/*; \
8282
\
83-
npm_config_python='python3' gosu node yarn add "sqlite3@$sqlite3Version" --force --build-from-source --ignore-optional; \
83+
npm_config_python='python2' gosu node yarn add "sqlite3@$sqlite3Version" --force --build-from-source --ignore-optional; \
8484
\
8585
apt-mark showmanual | xargs apt-mark auto > /dev/null; \
8686
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \

0 commit comments

Comments
 (0)