honorable-parrot/linux-wasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from hmaerki/fix_readme

Browse Source 
Fix the contained Docker images
This commit is contained in:
Joel Severin 2025-11-30 20:51:20 +01:00 committed by GitHub
commit 970e08b0d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.dockerignore Normal file
View File

@ -0,0 +1,3 @@
*
!patches/**
!linux-wasm.sh

10
README.md
View File

@ -72,21 +72,21 @@ There are two containers:
* **linux-wasm-contained**: Actually builds everything into the container. Meant as a disposable way to build everything isolated. * **linux-wasm-contained**: Actually builds everything into the container. Meant as a disposable way to build everything isolated.
Create the containers: Create the containers:
``` ```bash
docker build -t linux-wasm-base:dev ./docker/linux-wasm-base 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. 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): 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 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 (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): To actually build everything inside the container (mostly useful for build servers):
``` ```bash
docker run -it -name full-linux-wasm linux-wasm-contained:dev /linux-wasm/linux-wasm.sh all 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. To change workspace folder, docker run -e LW_WORKSPACE=/path/to/workspace ...blah... can be used. This may be useful together with docker volumes.

7
docker/linux-wasm-base/Dockerfile
View File

@ -12,5 +12,10 @@ RUN apt update && \
apt update && \ apt update && \
test -f /usr/share/doc/kitware-archive-keyring/copyright || rm /usr/share/keyrings/kitware-archive-keyring.gpg && \ 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 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/* 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"