Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Jan 13, 2022

Changes:

Changes:

- docker-library/ghost@ae48809: Merge pull request docker-library/ghost#281 from ianmclinden/fix-arm-arm64-sharp
- docker-library/ghost@a398151: [FIX] arm64/arm libvips (broken sqlite build)
@github-actions
Copy link

Diff for ad00403:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 2be7a12..cbc219f 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -13,10 +13,10 @@ Directory: 3/alpine
 
 Tags: 4.32.2, 4.32, 4, latest
 Architectures: amd64, arm32v7, arm64v8, ppc64le, s390x
-GitCommit: 7a6df53edfc81ce8e63a69011994c70333601de1
+GitCommit: a3981512d2f9e368d75b97b2f80db91a97dfcff4
 Directory: 4/debian
 
 Tags: 4.32.2-alpine, 4.32-alpine, 4-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8
-GitCommit: 7a6df53edfc81ce8e63a69011994c70333601de1
+GitCommit: a3981512d2f9e368d75b97b2f80db91a97dfcff4
 Directory: 4/alpine
diff --git a/ghost_alpine/Dockerfile b/ghost_alpine/Dockerfile
index 27de9c6..b11494a 100644
--- a/ghost_alpine/Dockerfile
+++ b/ghost_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/ghost_latest/Dockerfile b/ghost_latest/Dockerfile
index bfbc89c..cbde2b4 100644
--- a/ghost_latest/Dockerfile
+++ b/ghost_latest/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; \

Relevant Maintainers:

@yosifkit yosifkit merged commit 72175d6 into docker-library:master Jan 13, 2022
@yosifkit yosifkit deleted the ghost branch January 13, 2022 23:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants