If you see this page, the nginx web server is successfully installed and +working. Further configuration is required.
+ +For online documentation and support please refer to
+nginx.org.
+Commercial support is available at
+nginx.com.
Thank you for using nginx.
+ + diff --git a/httpserver-node21-nextjs/README.md b/httpserver-node21-nextjs/README.md index 2cc64f78..8afe58e7 100644 --- a/httpserver-node21-nextjs/README.md +++ b/httpserver-node21-nextjs/README.md @@ -115,7 +115,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: node:21`: The Unikraft runtime kernel to use is Node 21. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/httpserver-node21-sveltekit/README.md b/httpserver-node21-sveltekit/README.md index 27923698..2f053587 100644 --- a/httpserver-node21-sveltekit/README.md +++ b/httpserver-node21-sveltekit/README.md @@ -159,7 +159,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: node:21`: The Unikraft runtime kernel to use is Node 21. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/httpserver-python3.12-django5.0/README.md b/httpserver-python3.12-django5.0/README.md index b5ac4b56..bcf1b0a7 100644 --- a/httpserver-python3.12-django5.0/README.md +++ b/httpserver-python3.12-django5.0/README.md @@ -136,7 +136,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: python:3.12`: The Unikraft runtime kernel to use is Python 3.12. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/httpserver-python3.12-flask3.0-sqlite/README.md b/httpserver-python3.12-flask3.0-sqlite/README.md index 2c92ad1b..3c87d6d9 100644 --- a/httpserver-python3.12-flask3.0-sqlite/README.md +++ b/httpserver-python3.12-flask3.0-sqlite/README.md @@ -132,7 +132,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: python:3.12`: The Unikraft runtime kernel to use is Python 3.12. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/httpserver-python3.12-flask3.0/README.md b/httpserver-python3.12-flask3.0/README.md index 83877f2d..bf988b89 100644 --- a/httpserver-python3.12-flask3.0/README.md +++ b/httpserver-python3.12-flask3.0/README.md @@ -114,7 +114,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: python:3.12`: The Unikraft runtime kernel to use is Python 3.12. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/httpserver-python3.12/README.md b/httpserver-python3.12/README.md index 5e0b4958..c68d3b81 100644 --- a/httpserver-python3.12/README.md +++ b/httpserver-python3.12/README.md @@ -114,7 +114,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: python:3.12`: The Unikraft runtime kernel to use is Python 3.12. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/httpserver-rust-trunkrs-leptos/Dockerfile b/httpserver-rust-trunkrs-leptos/Dockerfile index 89dc4976..92e9fc8c 100644 --- a/httpserver-rust-trunkrs-leptos/Dockerfile +++ b/httpserver-rust-trunkrs-leptos/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.85.0-slim-bullseye AS builder +FROM rust:1.88.0-slim-bullseye AS builder RUN rustup target add wasm32-unknown-unknown && cargo install wasm-bindgen-cli && cargo install --locked trunk # Set up the working directory in the container @@ -17,9 +17,42 @@ RUN trunk build --config ./frontend/Trunk.toml --release EXPOSE 8080 +FROM nginx:1.25.3-bookworm AS nginx + +RUN set -xe; \ + rm -f /var/log/nginx/access.log; \ + rm -f /var/log/nginx/error.log; \ + touch /var/log/nginx/access.log; \ + touch /var/log/nginx/error.log \ + ; + # Use a smaller base image for the final runtime # FROM nginx:1.27.4-alpine FROM scratch + +# Nginx binaries, modules, configuration, log and runtime files +COPY --from=nginx /usr/sbin/nginx /usr/bin/nginx +COPY --from=nginx /usr/lib/nginx /usr/lib/nginx +COPY --from=nginx /etc/nginx /etc/nginx +COPY --from=nginx /etc/passwd /etc/passwd +COPY --from=nginx /etc/group /etc/group +COPY --from=nginx /var/log/nginx /var/log/nginx +COPY --from=nginx /var/cache/nginx /var/cache/nginx +COPY --from=nginx /var/run /var/run + +# Libraries +COPY --from=nginx /lib/x86_64-linux-gnu/libcrypt.so.1 /lib/x86_64-linux-gnu/libcrypt.so.1 +COPY --from=nginx /lib/x86_64-linux-gnu/libpcre2-8.so.0 /lib/x86_64-linux-gnu/libpcre2-8.so.0 +COPY --from=nginx /lib/x86_64-linux-gnu/libssl.so.3 /lib/x86_64-linux-gnu/libssl.so.3 +COPY --from=nginx /lib/x86_64-linux-gnu/libcrypto.so.3 /lib/x86_64-linux-gnu/libcrypto.so.3 +COPY --from=nginx /lib/x86_64-linux-gnu/libz.so.1 /lib/x86_64-linux-gnu/libz.so.1 +COPY --from=nginx /lib/x86_64-linux-gnu/libc.so.6 /lib/x86_64-linux-gnu/libc.so.6 +COPY --from=nginx /lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 +COPY --from=nginx /etc/ld.so.cache /etc/ld.so.cache + +# Custom configuration files, including using a single process for Nginx +COPY ./rootfs/ / + COPY --from=builder /usr/src/frontend/frontend/nginx.conf /etc/nginx/nginx.conf COPY --from=builder /usr/src/frontend/frontend/dist /usr/share/nginx/html/ diff --git a/httpserver-rust-trunkrs-leptos/Kraftfile b/httpserver-rust-trunkrs-leptos/Kraftfile index bbfbf643..369efbef 100644 --- a/httpserver-rust-trunkrs-leptos/Kraftfile +++ b/httpserver-rust-trunkrs-leptos/Kraftfile @@ -1,6 +1,6 @@ spec: v0.6 -runtime: nginx:latest +runtime: base-compat:latest labels: cloud.unikraft.v1.instances/scale_to_zero.policy: "on" diff --git a/httpserver-rust-trunkrs-leptos/rootfs/rootfs/etc/nginx/nginx.conf b/httpserver-rust-trunkrs-leptos/rootfs/rootfs/etc/nginx/nginx.conf new file mode 100644 index 00000000..7ee052f1 --- /dev/null +++ b/httpserver-rust-trunkrs-leptos/rootfs/rootfs/etc/nginx/nginx.conf @@ -0,0 +1,31 @@ +worker_processes 1; +daemon off; +master_process off; +user root root; + +events { + worker_connections 64; +} + +http { + include mime.types; + default_type application/octet-stream; + + open_file_cache max=10000 inactive=30s; + open_file_cache_min_uses 2; + open_file_cache_errors on; + + error_log stderr error; + access_log off; + + keepalive_timeout 10s; + keepalive_requests 10000; + send_timeout 10s; + + server { + listen 8080; + server_name localhost; + root /wwwroot; + index index.html; + } +} diff --git a/httpserver-rust-trunkrs-leptos/rootfs/rootfs/wwwroot/index.html b/httpserver-rust-trunkrs-leptos/rootfs/rootfs/wwwroot/index.html new file mode 100644 index 00000000..2ca3b954 --- /dev/null +++ b/httpserver-rust-trunkrs-leptos/rootfs/rootfs/wwwroot/index.html @@ -0,0 +1,25 @@ + + + +If you see this page, the nginx web server is successfully installed and +working. Further configuration is required.
+ +For online documentation and support please refer to
+nginx.org.
+Commercial support is available at
+nginx.com.
Thank you for using nginx.
+ + diff --git a/imaginary/README.md b/imaginary/README.md index 8db1d82c..c29a39ec 100644 --- a/imaginary/README.md +++ b/imaginary/README.md @@ -127,7 +127,7 @@ You can customize the command line options used to start the service, by updatin ```yaml spec: v0.6 -runtime: imaginary:1.2 +runtime: base-compat:latest cmd: ["/usr/bin/imaginary", "-p", "8080"] ``` diff --git a/ruby3.2-rails/README.md b/ruby3.2-rails/README.md index 57510748..1417557e 100644 --- a/ruby3.2-rails/README.md +++ b/ruby3.2-rails/README.md @@ -143,7 +143,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: ruby:3.2`: The Unikraft runtime kernel to use is Ruby 3.2. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`. diff --git a/spin-wagi-http/README.md b/spin-wagi-http/README.md index dd5c642c..96c682b6 100644 --- a/spin-wagi-http/README.md +++ b/spin-wagi-http/README.md @@ -125,7 +125,7 @@ Lines in the `Kraftfile` have the following roles: * `spec: v0.6`: The current `Kraftfile` specification version is `0.6`. -* `runtime: spin:latest`: The Unikraft runtime kernel to use is Spin. +* `runtime: base-compat:latest`: The runtime kernel to use is the base compatibility kernel. * `rootfs: ./Dockerfile`: Build the app root filesystem using the `Dockerfile`.