Skip to content

Commit d88048d

Browse files
committed
Docker: Re-generate Dockerfile.wasm
This now includes support for the 'wasm-wasi-component' module. This targets the upcoming 1.32.0 release which is required by wasm-wasi-component. However of course the 1.32.0 tag doesn't exist yet, so there will be a small window where this image won't build. Signed-off-by: Andrew Clayton <[email protected]>
1 parent c73edc9 commit d88048d

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

pkg/docker/Dockerfile.wasm

+8-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.url="https://unit.nginx.org"
66
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
77
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
88
LABEL org.opencontainers.image.vendor="NGINX Docker Maintainers <[email protected]>"
9-
LABEL org.opencontainers.image.version="1.31.1"
9+
LABEL org.opencontainers.image.version="1.32.0"
1010

1111
RUN set -ex \
1212
&& savedAptMark="$(apt-mark showmanual)" \
@@ -15,7 +15,7 @@ RUN set -ex \
1515
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
1616
&& mkdir -p /usr/src/unit \
1717
&& cd /usr/src/unit \
18-
&& git clone --depth 1 -b 1.31.1-1 https://github.com/nginx/unit \
18+
&& git clone --depth 1 -b 1.32.0-1 https://github.com/nginx/unit \
1919
&& cd unit \
2020
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2121
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -45,7 +45,8 @@ RUN set -ex \
4545
&& make -j $NCPU unitd \
4646
&& install -pm755 build/sbin/unitd /usr/sbin/unitd \
4747
&& make clean \
48-
&& export RUST_VERSION=1.71.0 \
48+
&& apt-get install --no-install-recommends --no-install-suggests -y libclang-dev \
49+
&& export RUST_VERSION=1.76.0 \
4950
&& export RUSTUP_HOME=/usr/src/unit/rustup \
5051
&& export CARGO_HOME=/usr/src/unit/cargo \
5152
&& export PATH=/usr/src/unit/cargo/bin:$PATH \
@@ -67,12 +68,12 @@ RUN set -ex \
6768
&& make -C pkg/contrib .wasmtime \
6869
&& install -pm 755 pkg/contrib/wasmtime/target/release/libwasmtime.so /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
6970
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/debug-modules --debug \
70-
&& ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
71-
&& make -j $NCPU wasm-install \
71+
&& ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ && ./configure wasm-wasi-component \
72+
&& make -j $NCPU wasm-install wasm-wasi-component-install \
7273
&& make clean \
7374
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
74-
&& ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ \
75-
&& make -j $NCPU wasm-install \
75+
&& ./configure wasm --include-path=`pwd`/pkg/contrib/wasmtime/crates/c-api/include --lib-path=/usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/ && ./configure wasm-wasi-component \
76+
&& make -j $NCPU wasm-install wasm-wasi-component-install \
7677
&& cd \
7778
&& rm -rf /usr/src/unit \
7879
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \

0 commit comments

Comments
 (0)