From b162149f00a03d79b6d6b24cdda95a6635828928 Mon Sep 17 00:00:00 2001 From: spmfox Date: Thu, 30 May 2024 10:24:59 -0400 Subject: removing un-needed 2nd build and deployment --- templates/bootcblade-deploy.sh.j2 | 4 +++- templates/bootcblade-rebuild.service.j2 | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/bootcblade-deploy.sh.j2 b/templates/bootcblade-deploy.sh.j2 index ecd91e3..9f4699f 100644 --- a/templates/bootcblade-deploy.sh.j2 +++ b/templates/bootcblade-deploy.sh.j2 @@ -6,4 +6,6 @@ podman run --rm --privileged \ --volume /:/target \ --entrypoint bootc \ localhost/bootcblade:latest \ - install to-filesystem --skip-fetch-check --replace=alongside /target --root-ssh-authorized-keys /target/root/.ssh/authorized_keys {{ '' if bootc_acknowledge is false else '--acknowledge-destructive' }} + install to-filesystem --skip-fetch-check --replace=alongside /target \ + --root-ssh-authorized-keys /target/root/.ssh/authorized_keys \ + --target-transport=containers-storage {{ '' if bootc_acknowledge is false else '--acknowledge-destructive' }} diff --git a/templates/bootcblade-rebuild.service.j2 b/templates/bootcblade-rebuild.service.j2 index 17aa89a..10e52ed 100644 --- a/templates/bootcblade-rebuild.service.j2 +++ b/templates/bootcblade-rebuild.service.j2 @@ -2,5 +2,6 @@ Description=BootcBlade rebuild service [Service] -ExecStart=/usr/bin/podman build -t localhost/bootcblade -f /root/bootcblade.containerfile --no-cache --pull=always +Type=oneshot +ExecStart=/usr/bin/bash -c "podman build -t localhost/bootcblade -f /root/bootcblade.containerfile --no-cache --pull=always" ExecStartPost=/usr/bin/bash -c "/usr/bin/sleep 10 ; /usr/bin/bootc update && /usr/bin/podman image prune -f" -- cgit