Merge branch 'master' into arm64
This commit is contained in:
commit
78444eaf07
@ -78,7 +78,7 @@ The following environment variables are supported:
|
||||
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)
|
||||
|
||||
* `RELEASE` (Default: bullseye)
|
||||
* `RELEASE` (Default: bookworm)
|
||||
|
||||
The release version to build images against. Valid values are any supported
|
||||
Debian release. However, since different releases will have different sets of
|
||||
|
@ -87,7 +87,7 @@ ${DOCKER} build --build-arg BASE_IMAGE=debian:bullseye -t pi-gen "${DIR}"
|
||||
if [ "${CONTAINER_EXISTS}" != "" ]; then
|
||||
DOCKER_CMDLINE_NAME="${CONTAINER_NAME}_cont"
|
||||
DOCKER_CMDLINE_PRE="--rm"
|
||||
DOCKER_CMDLINE_POST="--volumes-from=\"${CONTAINER_NAME}\""
|
||||
DOCKER_CMDLINE_POST="--volumes-from=${CONTAINER_NAME}"
|
||||
else
|
||||
DOCKER_CMDLINE_NAME="${CONTAINER_NAME}"
|
||||
DOCKER_CMDLINE_PRE=""
|
||||
|
Loading…
x
Reference in New Issue
Block a user