Skip to content

Commit 91ac514

Browse files
committed
build-LXD.sh: Make sure to set branch variable if inherited
Signed-off-by: Tobias K <[email protected]>
1 parent 437f30d commit 91ac514

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

build/build-LXD.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@ LXC_CREATE+=(ncp)
6262
#fi
6363

6464
set -x
65+
EXEC_ARGS=()
66+
[[ -z "$BRANCH" ]] || EXEC_ARGS+=(--env "BRANCH=${BRANCH}")
6567
systemd-run --user --scope -p "Delegate=yes" $LXC_CMD start ncp -q || \
6668
sudo systemd-run --scope -p "Delegate=yes" $LXC_CMD start ncp -q
6769
$LXC_CMD config device add ncp buildcode disk source="$(pwd)" path=/build
68-
$LXC_CMD exec ncp -- bash -c 'while [ "$(systemctl is-system-running 2>/dev/null)" != "running" ] && [ "$(systemctl is-system-running 2>/dev/null)" != "degraded" ]; do :; done'
69-
$LXC_CMD exec ncp -- bash -c 'CODE_DIR=/build DBG=x bash /build/install.sh'
70-
$LXC_CMD exec ncp -- bash -c 'source /build/etc/library.sh; run_app_unsafe /build/post-inst.sh'
71-
$LXC_CMD exec ncp -- bash -c "echo '$(basename "$IMG")' > /usr/local/etc/ncp-baseimage"
70+
$LXC_CMD exec ncp "${EXEC_ARGS[@]}" -- bash -c 'while [ "$(systemctl is-system-running 2>/dev/null)" != "running" ] && [ "$(systemctl is-system-running 2>/dev/null)" != "degraded" ]; do :; done'
71+
$LXC_CMD exec ncp "${EXEC_ARGS[@]}" -- bash -c 'CODE_DIR=/build DBG=x bash /build/install.sh'
72+
$LXC_CMD exec ncp "${EXEC_ARGS[@]}" -- bash -c 'source /build/etc/library.sh; run_app_unsafe /build/post-inst.sh'
73+
$LXC_CMD exec ncp "${EXEC_ARGS[@]}" -- bash -c "echo '$(basename "$IMG")' > /usr/local/etc/ncp-baseimage"
7274
$LXC_CMD stop ncp
7375
$LXC_CMD config device remove ncp buildcode
7476
$LXC_CMD publish -q ncp -f --alias ncp/"${version}"

0 commit comments

Comments
 (0)