rudefox
/
burrow-pi-img
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge 16aa0439a4 into 9a3a10bf10

pull/343/merge
snoe925 2020-06-30 09:11:35 -05:00 committed by GitHub
parent 9a3a10bf10 16aa0439a4
commit 977c104f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-docker.sh
View File

@ -14,6 +14,11 @@ if ! ${DOCKER} ps >/dev/null; then
exit 1
fi
# Pass APT_PROXY into Docker run environment
if test -n "$APT_PROXY"; then
DOCKER_APT_PROXY="-e APT_PROXY=$APT_PROXY"
fi
CONFIG_FILE=""
if [ -f "${DIR}/config" ]; then
CONFIG_FILE="${DIR}/config"
@ -78,7 +83,7 @@ if [ "${CONTAINER_EXISTS}" != "" ]; then
trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}_cont' SIGINT SIGTERM
time ${DOCKER} run --rm --privileged \
--volume "${CONFIG_FILE}":/config:ro \
-e "GIT_HASH=${GIT_HASH}" \
-e "GIT_HASH=${GIT_HASH}" ${DOCKER_APT_PROXY} \
--volumes-from="${CONTAINER_NAME}" --name "${CONTAINER_NAME}_cont" \
pi-gen \
bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
@ -89,7 +94,7 @@ else
trap 'echo "got CTRL+C... please wait 5s" && ${DOCKER} stop -t 5 ${CONTAINER_NAME}' SIGINT SIGTERM
time ${DOCKER} run --name "${CONTAINER_NAME}" --privileged \
--volume "${CONFIG_FILE}":/config:ro \
-e "GIT_HASH=${GIT_HASH}" \
-e "GIT_HASH=${GIT_HASH}" ${DOCKER_APT_PROXY} \
pi-gen \
bash -e -o pipefail -c "dpkg-reconfigure qemu-user-static &&
cd /pi-gen; ./build.sh ${BUILD_OPTS} &&