Skip to content

Commit 1bf8746

Browse files
9larsonstianon
andauthored
Update to 6.30.0, move from yarn to pnpm (#467)
ref TryGhost/Ghost@f186b6a Ghost moved over **after 6.28 was cut** from yarn to pnpm for the package manager. As `yarn.lock` no longer exists, we need to update the Docker image to point ot the `pnpm-lock` file and run `corepack enable`. --------- Co-authored-by: Tianon Gravi <admwiggin@gmail.com>
1 parent 949d90a commit 1bf8746

5 files changed

Lines changed: 12 additions & 11 deletions

File tree

6/alpine3.23/Dockerfile

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

6/bookworm/Dockerfile

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ ENV NODE_ENV production
6464

6565
ENV GHOST_CLI_VERSION {{ .cli.version }}
6666
RUN set -eux; \
67+
corepack enable; \
6768
npm install -g "ghost-cli@$GHOST_CLI_VERSION"; \
6869
npm cache clean --force
6970

@@ -110,10 +111,9 @@ RUN set -eux; \
110111
{{ clean_apt }}; \
111112
{{ ) end -}}
112113
\
113-
gosu node yarn cache clean; \
114+
gosu node pnpm store prune; \
114115
gosu node npm cache clean --force; \
115116
npm cache clean --force; \
116-
rm -rv /tmp/yarn* /tmp/v8*; \
117117
\
118118
# test that the optional dependencies are installed and loadable
119119
cd current; \

versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"6": {
3-
"version": "6.28.0",
3+
"version": "6.30.0",
44
"cli": {
55
"version": "1.29.1"
66
},

versions.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,17 @@ for version in "${versions[@]}"; do
4949

5050
# get a list of architectures supported by the sharp module's prebuilt libraries
5151
# we cannot build it on other arches since the dep, libvips, is usually too old in Debian and Alpine
52-
doc="$(curl -fsSL "https://raw.githubusercontent.com/TryGhost/Ghost/refs/tags/v$fullVersion/yarn.lock" \
52+
doc="$(curl -fsSL "https://raw.githubusercontent.com/TryGhost/Ghost/refs/tags/v$fullVersion/pnpm-lock.yaml" \
5353
| jq --compact-output --raw-input --null-input '
5454
reduce (
5555
inputs
56-
| capture("^ *\"@img/sharp-(?<dist>linux[a-z]*)-(?<arch>[a-z0-9]+)\" \"[0-9.]+\"$")
56+
| capture("^ *'"'"'@img/sharp-(?<dist>linux[a-z]*)-(?<arch>[a-z0-9]+)@[0-9.]+'"'"':")
5757
) as $item ({
5858
# this controls the variant ordering
5959
linux: [], # non-Alpine first
6060
linuxmusl: [], # Alpine second
6161
}; .[$item.dist] += [ $item.arch ])
62+
| map_values(unique)
6263
| with_entries(
6364
select(.value | length > 0)
6465
| .key = {

0 commit comments

Comments
 (0)