From 4e892e9d7a350d678e6ccce4a16844906e5f2f51 Mon Sep 17 00:00:00 2001 From: Hans Maerki Date: Sat, 8 Nov 2025 11:18:03 +0100 Subject: [PATCH 1/3] README.md: Fix some typos. Add .dockerignore Signed-off-by: Hans Maerki --- .dockerignore | 3 +++ README.md | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..dbc3da1 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,3 @@ +* +!patches/** +!linux-wasm.sh diff --git a/README.md b/README.md index 4c29ba6..075b520 100644 --- a/README.md +++ b/README.md @@ -72,21 +72,21 @@ There are two containers: * **linux-wasm-contained**: Actually builds everything into the container. Meant as a dispoable way to build everything isolated. Create the containers: -``` +```bash docker build -t linux-wasm-base:dev ./docker/linux-wasm-base -docker build -t linux-wasm-contained:dev ./docker/linux-wasm-contained +docker build -t linux-wasm-contained:dev -f ./docker/linux-wasm-contained/Dockerfile . ``` Note that the latter command will copy linux-wasm.sh, in its current state, into the container. To launch a simple docker container with a mapping to host (recommended for development): -``` +```bash docker run -it --name my-linux-wasm --mount type=bind,src="$(pwd)",target=/linux-wasm linux-wasm-base:dev bash (Inside the bash prompt, run for example:) /linux-wasm/linux-wasm.sh all ``` To actually build everything inside the container (mostly useful for build servers): -``` -docker run -it -name full-linux-wasm linux-wasm-contained:dev /linux-wasm/linux-wasm.sh all +```bash +docker run -it --name full-linux-wasm linux-wasm-contained:dev /linux-wasm/linux-wasm.sh all ``` To change workspace folder, docker run -e LW_WORKSPACE=/path/to/workspace ...blah... can be used. This may be useful together with docker volumes. From 6f33d46d7497f4dc859d4a795acdbcba09abd59e Mon Sep 17 00:00:00 2001 From: Hans Maerki Date: Sat, 8 Nov 2025 11:18:31 +0100 Subject: [PATCH 2/3] Dockerfile: Add missing packages Signed-off-by: Hans Maerki --- docker/linux-wasm-base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/linux-wasm-base/Dockerfile b/docker/linux-wasm-base/Dockerfile index 96ed232..a0ec956 100644 --- a/docker/linux-wasm-base/Dockerfile +++ b/docker/linux-wasm-base/Dockerfile @@ -12,5 +12,5 @@ RUN apt update && \ apt update && \ test -f /usr/share/doc/kitware-archive-keyring/copyright || rm /usr/share/keyrings/kitware-archive-keyring.gpg && \ apt install -y kitware-archive-keyring && \ - apt install -y build-essential git cmake ninja-build && \ + apt install -y build-essential git cmake ninja-build python3 flex bison bc rsync cpio && \ rm -rf /var/lib/apt/lists/* From c84810636a9d95b448b59b0093e8bb4297d8daa3 Mon Sep 17 00:00:00 2001 From: Hans Maerki Date: Sat, 8 Nov 2025 11:20:48 +0100 Subject: [PATCH 3/3] Dockerfile: Prevent git asking for user Signed-off-by: Hans Maerki --- docker/linux-wasm-base/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/docker/linux-wasm-base/Dockerfile b/docker/linux-wasm-base/Dockerfile index a0ec956..802c2e3 100644 --- a/docker/linux-wasm-base/Dockerfile +++ b/docker/linux-wasm-base/Dockerfile @@ -14,3 +14,8 @@ RUN apt update && \ apt install -y kitware-archive-keyring && \ apt install -y build-essential git cmake ninja-build python3 flex bison bc rsync cpio && \ rm -rf /var/lib/apt/lists/* + +# Prevent git asking for user +# Corresponds to: +RUN git config --system user.email "you@example.com" +RUN git config --system user.name "Your Name"