Skip to content

Commit 75b9b64

Browse files
committed
Fix mountpoint
1 parent a3eb83e commit 75b9b64

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

.github/workflows/build-archlinuxarm.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
set -euxo pipefail
4141
mkdir -p "${PLATFORM}"
4242
docker run --rm --platform "${PLATFORM}" \
43-
-v "$(pwd)/${PLATFORM}:/work" \
43+
-v "$(pwd)/${PLATFORM}:/mnt" \
4444
-v "$(pwd)/setup-arch.sh:/setup-arch.sh" \
45-
--privileged alpine /setup-arch.sh /work aarch64
45+
--privileged alpine /setup-arch.sh
4646
4747
- name: Prepare rootfs (armv7h)
4848
env:
@@ -51,9 +51,9 @@ jobs:
5151
set -euxo pipefail
5252
mkdir -p "${PLATFORM}"
5353
docker run --rm --platform "${PLATFORM}" \
54-
-v "$(pwd)/${PLATFORM}:/work" \
54+
-v "$(pwd)/${PLATFORM}:/mnt" \
5555
-v "$(pwd)/setup-arch.sh:/setup-arch.sh" \
56-
--privileged alpine /setup-arch.sh /work armv7h
56+
--privileged alpine /setup-arch.sh
5757
5858
- name: Build and push multi-arch image
5959
env:

setup-arch.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
set -exuo pipefail
44

55
GPG_KEY_ID="77193F152BDBE6A6"
6-
MOUNTPOINT="$1"
7-
ARCHITECTURE="${2:-\$arch}"
6+
MOUNTPOINT="/mnt"
7+
ARCHITECTURE="${1:-\$arch}"
8+
shift
89

910
apk update
1011
apk add --no-cache arch-install-scripts

0 commit comments

Comments
 (0)