Skip to content

quickjs: add the engine #156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 25, 2024
Merged

quickjs: add the engine #156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8298368
quickjs: add the engine
macbre Nov 25, 2024
9493dac
Ecbo the quickjs version
macbre Nov 25, 2024
dc45b92
Update Dockerfile
macbre Nov 25, 2024
862ce85
Update Dockerfile
macbre Nov 25, 2024
e6871fa
Update readme.md
macbre Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 20 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,14 @@ RUN \
&& apk add --no-cache --virtual .geoip2-build-deps \
libmaxminddb-dev \
&& apk add --no-cache --virtual .njs-build-deps \
readline-dev
libedit-dev \
libxml2-dev \
libxslt-dev \
openssl-dev \
pcre-dev \
readline-dev \
zlib-dev \
&& git config --global init.defaultBranch master

WORKDIR /usr/src/

Expand Down Expand Up @@ -164,22 +171,29 @@ RUN \
echo "Downloading ngx_http_geoip2_module ..." \
&& git clone --depth 1 --branch ${GEOIP2_VERSION} https://github.com/leev/ngx_http_geoip2_module /usr/src/ngx_http_geoip2_module

RUN \
echo "Cloning and configuring quickjs ..." \
&& cd /usr/src \
&& git clone https://github.com/bellard/quickjs quickjs \
&& cd quickjs \
&& make libquickjs.a \
&& echo "quickjs $(cat VERSION)"

RUN \
echo "Cloning and configuring njs ..." \
&& mkdir /usr/src/njs \
&& cd /usr/src/njs \
&& mkdir /usr/src/njs && cd /usr/src/njs \
&& git init \
&& git remote add origin https://github.com/nginx/njs.git \
&& git fetch --depth 1 origin ${NJS_COMMIT} \
&& git checkout -q FETCH_HEAD \
&& ./configure \
&& ./configure --cc-opt='-I /usr/src/quickjs' --ld-opt="-L /usr/src/quickjs" \
&& make njs \
&& mv /usr/src/njs/build/njs /usr/sbin/njs \
&& echo "njs v$(njs -v)"

# https://github.com/macbre/docker-nginx-http3/issues/152
ARG CC_OPT='-g -O2 -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects'
ARG LD_OPT='-Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto'
ARG CC_OPT='-g -O2 -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -I /usr/src/quickjs'
ARG LD_OPT='-Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto -L /usr/src/quickjs'
RUN \
echo "Building nginx ..." \
&& mkdir -p /var/run/nginx/ \
Expand Down
4 changes: 2 additions & 2 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ configure arguments:
--add-module=/usr/src/headers-more-nginx-module-0.37
--add-module=/usr/src/njs/nginx
--add-dynamic-module=/usr/src/ngx_http_geoip2_module
--with-cc-opt='-g -O2 -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects'
--with-ld-opt='-Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto'
--with-cc-opt='-g -O2 -flto=auto -ffat-lto-objects -flto=auto -ffat-lto-objects -I /usr/src/quickjs'
--with-ld-opt='-Wl,-Bsymbolic-functions -flto=auto -ffat-lto-objects -flto=auto -L /usr/src/quickjs'

$ docker run -it macbre/nginx-http3 njs -v
0.8.7
Expand Down