Skip to content

Update to 4.46.0 #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 2, 2022
Merged

Update to 4.46.0 #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions 4/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN set -eux; \
ENV GHOST_INSTALL /var/lib/ghost
ENV GHOST_CONTENT /var/lib/ghost/content

ENV GHOST_VERSION 4.44.0
ENV GHOST_VERSION 4.46.0

RUN set -eux; \
mkdir -p "$GHOST_INSTALL"; \
Expand Down Expand Up @@ -48,14 +48,14 @@ RUN set -eux; \
# see https://github.com/TryGhost/Ghost/pull/7677 for more details
cd "$GHOST_INSTALL/current"; \
# scrape the expected version of sqlite3 directly from Ghost itself
sqlite3Version="$(node -p 'require("./package.json").optionalDependencies["@vscode/sqlite3"]')"; \
sqlite3Version="$(node -p 'require("./package.json").optionalDependencies["sqlite3"]')"; \
[ -n "$sqlite3Version" ]; \
[ "$sqlite3Version" != 'undefined' ]; \
if ! su-exec node yarn add "@vscode/sqlite3@$sqlite3Version" --force; then \
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 python2 vips-dev; \
\
npm_config_python='python2' su-exec node yarn add "@vscode/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; \
Expand Down
8 changes: 4 additions & 4 deletions 4/debian/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN set -eux; \
ENV GHOST_INSTALL /var/lib/ghost
ENV GHOST_CONTENT /var/lib/ghost/content

ENV GHOST_VERSION 4.44.0
ENV GHOST_VERSION 4.46.0

RUN set -eux; \
mkdir -p "$GHOST_INSTALL"; \
Expand Down Expand Up @@ -72,17 +72,17 @@ RUN set -eux; \
# see https://github.com/TryGhost/Ghost/pull/7677 for more details
cd "$GHOST_INSTALL/current"; \
# scrape the expected version of sqlite3 directly from Ghost itself
sqlite3Version="$(node -p 'require("./package.json").optionalDependencies["@vscode/sqlite3"]')"; \
sqlite3Version="$(node -p 'require("./package.json").optionalDependencies["sqlite3"]')"; \
[ -n "$sqlite3Version" ]; \
[ "$sqlite3Version" != 'undefined' ]; \
if ! gosu node yarn add "@vscode/sqlite3@$sqlite3Version" --force; then \
if ! gosu 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
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends g++ gcc libc-dev libvips-dev make python2; \
rm -rf /var/lib/apt/lists/*; \
\
npm_config_python='python2' gosu node yarn add "@vscode/sqlite3@$sqlite3Version" --force --build-from-source; \
npm_config_python='python2' gosu node yarn add "sqlite3@$sqlite3Version" --force --build-from-source; \
\
apt-mark showmanual | xargs apt-mark auto > /dev/null; \
[ -z "$savedAptMark" ] || apt-mark manual $savedAptMark; \
Expand Down