particle-os/debian-koji-osbuild
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

run-builder: supply --rm only for "fg"

Browse source 
When run in the background, remove the container in "builder_stop",
this should make it easier to print logs between starting and
stopping the container.
This commit is contained in:
Christian Kellner 2020-09-16 23:29:37 +02:00
parent 5b237ffe84
commit 14003137fc
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
run-builder.sh
View file

@ -24,7 +24,7 @@ builder_start() {
GATEWAY_IP=$(${CONTAINER_RUNTIME} network inspect org.osbuild.koji | jq -r ".[0].plugins[0].ipam.ranges[0][0].gateway") GATEWAY_IP=$(${CONTAINER_RUNTIME} network inspect org.osbuild.koji | jq -r ".[0].plugins[0].ipam.ranges[0][0].gateway")
echo "Gateway IP is $GATEWAY_IP" echo "Gateway IP is $GATEWAY_IP"
${CONTAINER_RUNTIME} run --rm ${CONTAINER_FLAGS} \ ${CONTAINER_RUNTIME} run ${CONTAINER_FLAGS} \
--name org.osbuild.koji.builder --network org.osbuild.koji \ --name org.osbuild.koji.builder --network org.osbuild.koji \
-v "${SHARE_DIR}:/share:z" \ -v "${SHARE_DIR}:/share:z" \
-v "${DATA_DIR}:/mnt:z" \ -v "${DATA_DIR}:/mnt:z" \
@ -36,6 +36,7 @@ builder_start() {
builder_stop() { builder_stop() {
${CONTAINER_RUNTIME} stop org.osbuild.koji.builder || true ${CONTAINER_RUNTIME} stop org.osbuild.koji.builder || true
${CONTAINER_RUNTIME} rm org.osbuild.koji.builder || true
} }
# check arguments # check arguments
@ -56,7 +57,7 @@ CONTAINER_FLAGS=-d
if [ $1 == "start" ]; then if [ $1 == "start" ]; then
builder_start builder_start
elif [ $1 == "fg" ]; then elif [ $1 == "fg" ]; then
CONTAINER_FLAGS=-it CONTAINER_FLAGS="-it --rm"
builder_start builder_start
elif [ $1 == "stop" ]; then elif [ $1 == "stop" ]; then
builder_stop builder_stop