Skip to content

Commit

Permalink
infra/image/build.sh: Fail if deployment failed or podman is missing
Browse files Browse the repository at this point in the history
If the deployment was enabled and failed, the script still continued
without failing. If podman was missing it failed without a proper error.

The script now fails and does not enable the services and also does not
commit after the failed deployment. Also is fails if podman is missing.
  • Loading branch information
t-woerner committed Jul 31, 2024
1 parent 172fe21 commit 59b1fa1
Showing 1 changed file with 16 additions and 5 deletions.
21 changes: 16 additions & 5 deletions infra/image/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ distro=${1:-}
[ -f "${BASEDIR}/dockerfile/${distro}" ] \
|| die "${distro} is not a valid distro target.\nUse one of: $(valid_distro)"

[ -n "$(command -v "podman")" ] || die "podman is required."

if [ "${deploy_server}" == "Y" ]
then
[ -n "$(command -v "ansible-playbook")" ] || die "ansible-playbook is required to install FreeIPA."
Expand Down Expand Up @@ -109,23 +111,32 @@ echo

if [ "${deploy_server}" == "Y" ]
then
deployed=false

log info "= Starting ${name} ="
[ "${container_state}" == "running" ] || podman start "${name}"
echo

log info "= Deploying IPA ="
ansible-playbook -i "${inventory_file}" "${deploy_playbook}"
if ansible-playbook -i "${inventory_file}" "${deploy_playbook}"
then
deployed=true
fi
echo

log info "= Enabling additional services ="
podman exec "${name}" systemctl enable fixnet
podman exec "${name}" systemctl enable fixipaip
echo
if $deployed; then
log info "= Enabling additional services ="
podman exec "${name}" systemctl enable fixnet
podman exec "${name}" systemctl enable fixipaip
echo
fi

log info "= Stopping container ${name} ="
podman stop "${name}"
echo

$deployed || die "Deployment failed"

log info "= Committing \"${quayname}:${server_tag}\" ="
podman commit "${name}" "${quayname}:${server_tag}"
echo
Expand Down

0 comments on commit 59b1fa1

Please sign in to comment.