Skip to content

Commit 3960ebf

Browse files
committed
Add dependencies for libpsl and AOM compilation in Dockerfile; simplify host machine build condition in prepare.php
1 parent 7a1f00b commit 3960ebf

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

prepare.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}
3232

3333
// Compile directly on the host machine, not in the docker container
34-
if ($p->getInputOption('without-docker') || ($p->isMacos()) || ($p->isLinux() && (!is_file('/.dockerenv')))) {
34+
if ($p->getInputOption('without-docker') || $p->isMacos()) {
3535
$p->setWorkDir(__DIR__);
3636
$p->setBuildDir(__DIR__ . '/thirdparty');
3737
}

sapi/docker/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,8 @@ RUN apk upgrade
1515
RUN apk add vim alpine-sdk xz autoconf automake linux-headers clang-dev clang lld libtool cmake bison re2c gettext coreutils
1616
RUN apk add bash tini
1717
RUN apk add libc++-static libltdl-static
18+
# Compiling libpsl requires using python3 to generate data files
19+
RUN apk add python3
20+
# Compiling AOM requires the use of NASM/YASM assembly compiler
21+
RUN apk add nasm
1822
WORKDIR /work

0 commit comments

Comments
 (0)