showpiece/showpiece-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Merge branch 'master' into arm64

Browse Source
This commit is contained in:
Serge Schneider 2023-03-27 14:44:45 +01:00
commit a2afdf78cb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-docker.sh
View File

@ -4,10 +4,15 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
BUILD_OPTS="$*" BUILD_OPTS="$*"
DOCKER="docker" # Allow user to override docker command
DOCKER=${DOCKER:-docker}
if ! ${DOCKER} ps >/dev/null 2>&1; then # Ensure that default docker command is not set up in rootless mode
DOCKER="sudo docker" if \
! ${DOCKER} ps >/dev/null 2>&1 || \
${DOCKER} info 2>/dev/null | grep -q rootless \
; then
DOCKER="sudo ${DOCKER}"
fi fi
if ! ${DOCKER} ps >/dev/null; then if ! ${DOCKER} ps >/dev/null; then
echo "error connecting to docker:" echo "error connecting to docker:"
@ -112,8 +117,9 @@ else
wait "$!" wait "$!"
fi fi
# Ensure that deploy/ is always owned by calling user
echo "copying results from deploy/" echo "copying results from deploy/"
${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy . ${DOCKER} cp "${CONTAINER_NAME}":/pi-gen/deploy - | tar -xf -
ls -lah deploy ls -lah deploy
# cleanup # cleanup