hulthe/mullvad-vpn-alpine
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Mount CARGO_HOME into build container

Browse Source
This commit is contained in:
Joakim Hulthe
2026-03-30 14:45:42 +02:00
parent 7650a60fa6
commit c92f4fbf84
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docker-build.sh
View File

@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
package="$1" package="$1"
builder_image="mullvad-slint-musl-builder" builder_image="mullvad-slint-musl-builder"
cargo_home="${CARGO_HOME:-$HOME/.cargo}"
. "$HOME/.abuild/abuild.conf" . "$HOME/.abuild/abuild.conf"
docker build . -f Dockerfile -t "$builder_image" docker build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ docker run --rm \
-v "$PACKAGER_PRIVKEY":/key.rsa:ro \ -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
-v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
-v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-v ./target:/cargo-target \
-v ./packages:/root/packages \ -v ./packages:/root/packages \
-v "$cargo_home":/cargo-home \
-e "CARGO_HOME=/cargo-home" \
-v ./target:/cargo-target \
-e "CARGO_TARGET_DIR=/cargo-target" \ -e "CARGO_TARGET_DIR=/cargo-target" \
-it \ -it \
"$builder_image" \ "$builder_image" \

5
podman-build.sh
View File

@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
package="$1" package="$1"
builder_image="mullvad-slint-musl-builder" builder_image="mullvad-slint-musl-builder"
cargo_home="${CARGO_HOME:-$HOME/.cargo}"
. "$HOME/.abuild/abuild.conf" . "$HOME/.abuild/abuild.conf"
podman build . -f Dockerfile -t "$builder_image" podman build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ podman run --rm \
-v "$PACKAGER_PRIVKEY":/key.rsa:ro \ -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
-v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
-v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-v ./target:/cargo-target \
-v ./packages:/root/packages \ -v ./packages:/root/packages \
-v "$cargo_home":/cargo-home \
-e "CARGO_HOME=/cargo-home" \
-v ./target:/cargo-target \
-e "CARGO_TARGET_DIR=/cargo-target" \ -e "CARGO_TARGET_DIR=/cargo-target" \
-it \ -it \
"$builder_image" \ "$builder_image" \