Skip to content

Commit 67269d3

Browse files
authored
Merge pull request #312 from infosiftr/virtual
Golf down the virtual declaration to avoid "ERROR: No such package: .build-deps-sharp"
2 parents d934156 + ae52dd8 commit 67269d3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

5/alpine/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ RUN set -eux; \
6969
installCmd='su-exec node yarn add "$package" --force'; \
7070
if ! eval "$installCmd"; then \
7171
# 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
72-
virtual=".build-deps-${package%%@*}"; \
73-
apkDel="$apkDel $virtual"; \
7472
virtualPackages='g++ make python3'; \
7573
case "$package" in \
7674
# TODO sharp@*) virtualPackages="$virtualPackages pkgconf vips-dev"; \
7775
sharp@*) echo >&2 "sorry: libvips 8.12.1 in Alpine 3.15 is not new enough (8.12.2+) for sharp 0.30 😞"; continue ;; \
7876
esac; \
77+
virtual=".build-deps-${package%%@*}"; \
78+
apkDel="$apkDel $virtual"; \
7979
apk add --no-cache --virtual "$virtual" $virtualPackages; \
8080
\
8181
eval "$installCmd --build-from-source"; \

0 commit comments

Comments
 (0)