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-10-17 14:42:49 +01:00
commit 78444eaf07
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -78,7 +78,7 @@ The following environment variables are supported:
that the network block device is not disconnected correctly after the Docker process has that the network block device is not disconnected correctly after the Docker process has
ended abnormally. In that case see [Disconnect an image if something went wrong](#Disconnect-an-image-if-something-went-wrong) ended abnormally. In that case see [Disconnect an image if something went wrong](#Disconnect-an-image-if-something-went-wrong)
* `RELEASE` (Default: bullseye) * `RELEASE` (Default: bookworm)
The release version to build images against. Valid values are any supported The release version to build images against. Valid values are any supported
Debian release. However, since different releases will have different sets of Debian release. However, since different releases will have different sets of

2
build-docker.sh
View File

@ -87,7 +87,7 @@ ${DOCKER} build --build-arg BASE_IMAGE=debian:bullseye -t pi-gen "${DIR}"
if [ "${CONTAINER_EXISTS}" != "" ]; then if [ "${CONTAINER_EXISTS}" != "" ]; then
DOCKER_CMDLINE_NAME="${CONTAINER_NAME}_cont" DOCKER_CMDLINE_NAME="${CONTAINER_NAME}_cont"
DOCKER_CMDLINE_PRE="--rm" DOCKER_CMDLINE_PRE="--rm"
DOCKER_CMDLINE_POST="--volumes-from=\"${CONTAINER_NAME}\"" DOCKER_CMDLINE_POST="--volumes-from=${CONTAINER_NAME}"
else else
DOCKER_CMDLINE_NAME="${CONTAINER_NAME}" DOCKER_CMDLINE_NAME="${CONTAINER_NAME}"
DOCKER_CMDLINE_PRE="" DOCKER_CMDLINE_PRE=""