fix(cross): Fix docker image and cross setup (#8094)

tauri-apps · Oct 26, 2023 · 6bc3b05 · 6bc3b05
1 parent 4077946
commit 6bc3b05
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/.docker/cross/aarch64.Dockerfile b/.docker/cross/aarch64.Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:22.04
 ARG DEBIAN_FRONTEND=noninteractive
 
 COPY common.sh lib.sh /

diff --git a/examples/api/.setup-cross.sh b/examples/api/.setup-cross.sh
@@ -3,3 +3,4 @@
 export ICONS_VOLUME="$(realpath ../.icons)"
 export DIST_VOLUME="$(realpath dist)"
 export ISOLATION_VOLUME="$(realpath isolation-dist)"
+export WORKSPACE_VOLUME="$(realpath ../..)"
diff --git a/examples/api/src-tauri/Cross.toml b/examples/api/src-tauri/Cross.toml
@@ -1,10 +1,11 @@
 [build.env]
-# must set ICONS_VOLUME, DIST_VOLUME and ISOLATION_VOLUME environment variables
+# must set ICONS_VOLUME, DIST_VOLUME, ISOLATION_VOLUME and WORKSPACE_VOLUME environment variables
 # ICONS_VOLUME: absolute path to the .icons folder
 # DIST_VOLUME: absolute path to the dist folder
 # ISOLATION_VOLUME: absolute path to the isolation dist folder
+# WORKSPACE_VOLUME: absolute path to the workspace
 # this can be done running `$ . .setup-cross.sh` in the examples/api folder
-volumes = ["ICONS_VOLUME", "DIST_VOLUME", "ISOLATION_VOLUME"]
+volumes = ["ICONS_VOLUME", "DIST_VOLUME", "ISOLATION_VOLUME","WORKSPACE_VOLUME"]
 
 [target.aarch64-unknown-linux-gnu]
 image = "aarch64-unknown-linux-gnu:latest"