Skip to content

Commit df7a530

Browse files
Timo Starkac000
Timo Stark
authored andcommitted
Wasm-wc: Dockerfile changed to pull sources from the right repository
Signed-off-by: Timo Stark <[email protected]> [ Updated for module name 'wasm-wasi-component' - Andrew ] Signed-off-by: Andrew Clayton <[email protected]>
1 parent 2619c91 commit df7a530

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

pkg/docker/Dockerfile.wasmtime renamed to pkg/docker/Dockerfile.wasm-wasi-component

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM debian:bullseye-slim
22

3-
LABEL org.opencontainers.image.title="Unit (wasm)"
4-
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
3+
LABEL org.opencontainers.image.title="Unit Preview (wasm-wasi-component)"
4+
LABEL org.opencontainers.image.description="Official preview build of Unit for Docker."
55
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"
@@ -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 https://github.com/alexcrichton/unit --branch wasmtime \
18+
&& git clone https://github.com/ac000/unit --branch wasm-cm \
1919
&& cd unit \
2020
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
2121
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
@@ -66,9 +66,9 @@ RUN set -ex \
6666
&& rustc --version \
6767
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
6868
&& make build/src/nxt_unit.o \
69-
&& cargo build --release --manifest-path wasmtime/Cargo.toml \
70-
&& install -pm755 wasmtime/target/release/libnxt_wasmtime.so /usr/lib/unit/modules/wasmtime.unit.so \
71-
&& rm -rf wasmtime/target \
69+
&& cargo build --release --manifest-path src/wasm-wasi-component/Cargo.toml \
70+
&& install -pm755 src/wasm-wasi-component/target/release/libnxt_wasmtime.so /usr/lib/unit/modules/wasm_wasi_component.unit.so \
71+
&& rm -rf src/wasm-wasi-component/target \
7272
&& rm -rf /usr/src/unit \
7373
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
7474
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \

0 commit comments

Comments
 (0)