Skip to content

Commit

Permalink
CASMINST-4471 adjust init script for podman load behavior
Browse files Browse the repository at this point in the history
podman load no longer allows the tagging of the image during a load op: containers/podman#7387

to adjust the script for this, I filter the images to match metal-basecamp, get
the image id, and then tag it in a separate command after the image has loaded

Signed-off-by: Jacob Salmela <[email protected]>
  • Loading branch information
jacobsalmela committed Apr 25, 2022
1 parent 1e25cd3 commit 6f1c902
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.1.11
1.1.12
8 changes: 6 additions & 2 deletions init/basecamp-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ fi
BASECAMP_PIDFILE="$1"
BASECAMP_CIDFILE="$2"
BASECAMP_CONTAINER_NAME="${3-metal\-basecamp}"
BASECAMP_VOLUME_NAME="${4:-${BASECAMP_CONTAINER_NAME}-configs}"

BASECAMP_IMAGE_PATH="@@basecamp-path@@"
BASECAMP_IMAGE="@@basecamp-image@@"
Expand Down Expand Up @@ -72,7 +71,12 @@ if ! podman inspect "$BASECAMP_CONTAINER_NAME" ; then
rm -f "$BASECAMP_CIDFILE" || exit
# Load basecamp image if it doesn't already exist
if ! podman image inspect "$BASECAMP_IMAGE" >dev/null; then
podman load "$BASECAMP_IMAGE_PATH" "$BASECAMP_IMAGE" || exit
# load the image
podman load -i "$BASECAMP_IMAGE_PATH" || exit
# get the image id
BASECAMP_IMAGE_ID=$(podman images --noheading --format "{{.Id}}" --filter label="org.label-schema.name=$BASECAMP_CONTAINER_NAME")
# tag the image
podman tag "$BASECAMP_IMAGE_ID" "$BASECAMP_IMAGE"
fi
podman create \
--conmon-pidfile "$BASECAMP_PIDFILE" \
Expand Down

0 comments on commit 6f1c902

Please sign in to comment.