Skip to content

Dockerfile changed to pull sources from the right repository #1

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 1 commit into from
Nov 2, 2023
Merged

Dockerfile changed to pull sources from the right repository #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions pkg/docker/Dockerfile.wasmtime
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM debian:bullseye-slim

LABEL org.opencontainers.image.title="Unit (wasm)"
LABEL org.opencontainers.image.description="Official build of Unit for Docker."
LABEL org.opencontainers.image.title="Unit Preview (wasm-wasi-http)"
LABEL org.opencontainers.image.description="Official preview build of Unit for Docker."
LABEL org.opencontainers.image.url="https://unit.nginx.org"
LABEL org.opencontainers.image.source="https://github.com/nginx/unit"
LABEL org.opencontainers.image.documentation="https://unit.nginx.org/installation/#docker-images"
Expand All @@ -15,7 +15,7 @@ RUN set -ex \
&& mkdir -p /usr/lib/unit/modules /usr/lib/unit/debug-modules \
&& mkdir -p /usr/src/unit \
&& cd /usr/src/unit \
&& git clone https://github.com/alexcrichton/unit --branch wasmtime \
&& git clone https://github.com/ac000/unit --branch wasm-wasi-http \
&& cd unit \
&& NCPU="$(getconf _NPROCESSORS_ONLN)" \
&& DEB_HOST_MULTIARCH="$(dpkg-architecture -q DEB_HOST_MULTIARCH)" \
Expand Down Expand Up @@ -66,9 +66,9 @@ RUN set -ex \
&& rustc --version \
&& ./configure $CONFIGURE_ARGS_MODULES --cc-opt="$CC_OPT" --modulesdir=/usr/lib/unit/modules \
&& make build/src/nxt_unit.o \
&& cargo build --release --manifest-path wasmtime/Cargo.toml \
&& install -pm755 wasmtime/target/release/libnxt_wasmtime.so /usr/lib/unit/modules/wasmtime.unit.so \
&& rm -rf wasmtime/target \
&& cargo build --release --manifest-path src/wasm-wasi-http/Cargo.toml \
&& install -pm755 src/wasm-wasi-http/target/release/libnxt_wasmtime.so /usr/lib/unit/modules/wasmtime.unit.so \
&& rm -rf src/wasm-wasi-http/target \
&& rm -rf /usr/src/unit \
&& for f in /usr/sbin/unitd /usr/lib/unit/modules/*.unit.so; do \
ldd $f | awk '/=>/{print $(NF-1)}' | while read n; do dpkg-query -S $n; done | sed 's/^\([^:]\+\):.*$/\1/' | sort | uniq >> /requirements.apt; \
Expand Down