Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove duplicate podman pulls #165

Merged
merged 6 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.7.11
current_version = 0.7.12

commit = True
tag = True
Expand Down
9 changes: 4 additions & 5 deletions src/_update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,12 @@ function mod_update() {
fi
else
info "AIRGAPPED mode enabled, skipping image pull"
# podman needs to remove containers before attempting to start with updated containers
if [ "$CONTAINER_RUNTIME" == "podman" ]; then
title "Removing old podman containers"
podman_remove
fi

if [ "$CONTAINER_RUNTIME" == "podman" ]; then
title "Pulling latest container images"
podman_remove
podman_pull_images
fi
mod_start || sleep 20
run_cb_migrations
if [ "$CONTAINER_RUNTIME" == "podman" ]; then
Expand Down
4 changes: 2 additions & 2 deletions src/plextrac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
set -Eeuo pipefail

VERSION=0.7.11
VERSION=0.7.12

## Podman Global Declaration Variable
declare -A svcValues
Expand Down Expand Up @@ -452,7 +452,7 @@ function run_cb_migrations() {
fi
for s in / - \\ \|; do
local log=""
local container=""
local container=""
container="$(container_client ps -a | grep migrations 2>/dev/null | awk '{print $1}')"
log="$(container_client logs $container 2> /dev/null | tail -n 1 -q || true)"
printf "\r\033[K%s %s -- %s" "$s" "$container" "$log"
Expand Down
Loading