macos-docker -> in-docker, add in-podman for Linux

Author: Chase

Dockerfile

@@ -1,4 +1,6 @@
-FROM emscripten/emsdk:3.1.73-arm64
+ARG ARCH=
+ARG VER=3.1.73
+FROM docker.io/emscripten/emsdk:${VER}${ARCH}
 
 RUN apt update && apt-get install -y --no-install-recommends \
   git \

README.md

@@ -16,7 +16,25 @@ Clone the repo and enter the dev environment:
 
 ```bash
 git clone https://github.com/coparse-inc/lok-wasm
-./macos-docker
+./in-docker
+```
+
+## Linux with Podman
+
+Clone the repo and enter the dev environment:
+
+```bash
+git clone https://github.com/coparse-inc/lok-wasm
+./in-podman
+```
+
+## Linux with Docker
+
+Clone the repo and enter the dev environment:
+
+```bash
+git clone https://github.com/coparse-inc/lok-wasm
+./in-docker
 ```
 
 ## Ubuntu/Debian/Pop_OS!

macos-docker in-dockermacos-docker renamed to in-docker

@@ -1,5 +1,14 @@
 #!/bin/sh
-docker build -q -t lok-wasm:3.1.73 .
+arch=$(uname -m)
+emsdk_version=3.1.73
+
+if [[ "$arch" == "arm64" || "$arch" == "aarch64" ]]; then
+  docker build -t lok-wasm:$emsdk_version --build-arg ARCH=-arm64 --build-arg VER=$emsdk_version .
+else
+  docker build -t lok-wasm:$emsdk_version --build-arg VER=$emsdk_version .
+fi
+mkdir -p .cache .npm
+
 exec docker run \
   --rm \
   -it \
@@ -12,5 +21,5 @@ exec docker run \
   -v $(pwd)/.npm:/.npm:rw \
   -u $(id -u):$(id -g) \
   -w / \
-  lok-wasm:3.1.73 \
+  lok-wasm:$emsdk_version \
   bash

in-podman

@@ -0,0 +1,26 @@
+#!/bin/sh
+arch=$(uname -m)
+emsdk_version=3.1.73
+
+if [[ "$arch" == "arm64" || "$arch" == "aarch64" ]]; then
+  podman build -t lok-wasm:$emsdk_version --build-arg ARCH=-arm64 --build-arg VER=$emsdk_version .
+else
+  podman build -t lok-wasm:$emsdk_version --build-arg VER=$emsdk_version .
+fi
+mkdir -p .cache .npm
+
+exec podman run \
+  --rm \
+  -it \
+  --user 1000:100 \
+  --userns=keep-id \
+  -v $(pwd)/libreoffice-core:/home/emscripten/libreoffice-core:Z \
+  -v $(pwd)/scripts:/home/emscripten/scripts:Z \
+  -v $(pwd)/VERSION:/home/emscripten/VERSION:Z \
+  -v $(pwd)/soffice_fccache.data:/home/emscripten/soffice_fccache.data:Z \
+  -v $(pwd)/soffice_fccache.data.js.metadata:/home/emscripten/soffice_fccache.data.js.metadata:Z \
+  -v $(pwd)/.cache:/home/emscripten/.cache:Z \
+  -v $(pwd)/.npm:/home/emscripten/.npm:Z \
+  -w /home/emscripten \
+  lok-wasm:$emsdk_version \
+  bash

scripts/build

@@ -10,7 +10,11 @@ FCCAHCE_OUT="$BASE_DIR/libreoffice-core/instdir/program/$FCCACHE_FILE"
 QA_ENV_DIR="$BASE_DIR/qa-env"
 
 # Add emscripten toolchain
-source "$BASE_DIR/emsdk/emsdk_env.sh"
+if [[ "$container" = "podman" ]]; then
+  source "/emsdk/emsdk_env.sh"
+else
+  source "$SCRIPT_DIR/../emsdk/emsdk_env.sh"
+fi
 cd "$BASE_DIR/libreoffice-core"
 echo "Building LOK"
 make || exit 1

scripts/configure

@@ -6,7 +6,11 @@ SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE:-$0}")" &> /dev/null && pwd)
 
 # Add emscripten toolchain
 export EMSDK_QUIET=1
-source "$SCRIPT_DIR/../emsdk/emsdk_env.sh"
+if [[ "$container" = "podman" ]]; then
+  source "/emsdk/emsdk_env.sh"
+else
+  source "$SCRIPT_DIR/../emsdk/emsdk_env.sh"
+fi
 cd "$SCRIPT_DIR/../libreoffice-core"
 
 # LOK requires GCC 12, which often isn't the default, check for gcc-12 and g++12 if necessary