Conversation
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)
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: |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: