Skip to content

Commit 9a686f3

Browse files
committed
fix dockerfiles to install pkg-config directly too
1 parent b9d8e0f commit 9a686f3

4 files changed

Lines changed: 47 additions & 38 deletions

File tree

Dockerfile.alpine

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN if [ -z "${RPM_ARCH}" ]; then \
1414

1515
RUN apt-get update && \
1616
apt-get install -y curl build-essential tar zstd python3 python3-requests jq gzip xz-utils sudo git gnupg llvm \
17-
bison re2c flex autoconf automake autopoint libtool pkg-config && \
17+
bison re2c flex autoconf automake autopoint libtool pkg-config unzip cmake && \
1818
apt-get upgrade -y && \
1919
mkdir -p /usr/lib/bfd-plugins && \
2020
PLUGIN=$(find /usr/lib /usr/lib64 -name LLVMgold.so 2>/dev/null | head -1) && \
@@ -46,6 +46,7 @@ RUN cd /tmp/spc-bootstrap && \
4646
composer install --no-interaction --prefer-dist --no-progress --no-scripts && \
4747
php vendor/bin/spc install-pkg go-xcaddy && \
4848
php vendor/bin/spc install-pkg zig && \
49+
SPC_TARGET=native-native-musl php vendor/bin/spc doctor --auto-fix --debug && \
4950
rm -rf /tmp/spc-bootstrap /root/.composer /root/.cache
5051

5152
WORKDIR /build

Dockerfile.debian

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ RUN cd /tmp/spc-bootstrap && \
4343
composer install --no-interaction --prefer-dist --no-progress --no-scripts && \
4444
php vendor/bin/spc install-pkg go-xcaddy && \
4545
php vendor/bin/spc install-pkg zig && \
46+
SPC_TARGET=native-native-musl php vendor/bin/spc doctor --auto-fix --debug && \
4647
rm -rf /tmp/spc-bootstrap /root/.composer /root/.cache
4748

4849
WORKDIR /build

Dockerfile.rhel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ RUN cd /tmp/spc-bootstrap && \
7777
composer install --no-interaction --prefer-dist --no-progress --no-scripts && \
7878
php vendor/bin/spc install-pkg go-xcaddy && \
7979
php vendor/bin/spc install-pkg zig && \
80+
SPC_TARGET=native-native-musl php vendor/bin/spc doctor --auto-fix --debug && \
8081
rm -rf /tmp/spc-bootstrap /root/.composer /root/.cache
8182

8283
WORKDIR /build

composer.lock

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

0 commit comments

Comments
 (0)