Skip to content

Commit 8ffdf39

Browse files
committed
Restored compatibility for Alpine 3.15
fixes TryGhost#1625 - Alpine 3.16 was released in May 2022 and 5.0.9 was the first release since it became the default for `node16-alpine` - compiling on Alpine 3.16 broke compatiblity for Alpine 3.15 - given we should be able to just build with 3.15 and the binaries end up forward-compatible, this commit reverts back to that
1 parent d3608c9 commit 8ffdf39

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ jobs:
121121
- linux/arm64
122122
variant:
123123
- bullseye
124-
- alpine
124+
- alpine3.15
125125
include:
126126
# musl x64 builds
127127
- target: linux/amd64
128-
variant: alpine
128+
variant: alpine3.15
129129
node: 16
130130
name: ${{ matrix.variant }} (node=${{ matrix.node }}, target=${{ matrix.target }})
131131
steps:

tools/BinaryBuilder.Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM node:$NODE_VERSION-$VARIANT
55

66
ARG VARIANT
77

8-
RUN if [ "$VARIANT" = "alpine" ] ; then apk add build-base python3 --update-cache ; fi
8+
RUN if [[ "$VARIANT" =~ alpine* ]] ; then apk add build-base python3 --update-cache ; fi
99

1010
WORKDIR /usr/src/build
1111

@@ -22,7 +22,7 @@ ENV CXXFLAGS="${CXXFLAGS:-} -include ../src/gcc-preinclude.h"
2222
RUN npx node-pre-gyp configure
2323
RUN npx node-pre-gyp build
2424

25-
RUN if [ "$VARIANT" != "alpine" ] ; then ldd lib/binding/*/node_sqlite3.node; nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true ; fi
25+
RUN if [[ ! "$VARIANT" =~ alpine* ]] ; then ldd lib/binding/*/node_sqlite3.node; nm lib/binding/*/node_sqlite3.node | grep "GLIBC_" | c++filt || true ; fi
2626

2727
RUN npm run test
2828
RUN npx node-pre-gyp package

0 commit comments

Comments
 (0)