Skip to content

Commit

Permalink
CASMINST-4471 change podman load to not use -i with new podman (#13)
Browse files Browse the repository at this point in the history
* CASMINST-4471 change podman load to not use -i with new podman

Signed-off-by: Jacob Salmela <[email protected]>

* version bump

Signed-off-by: Jacob Salmela <[email protected]>
  • Loading branch information
jacobsalmela authored Apr 23, 2022
1 parent ffc9abd commit 1e25cd3
Show file tree
Hide file tree
Showing 2 changed files with 3 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.10
1.1.11
4 changes: 2 additions & 2 deletions init/basecamp-init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ 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 -i "$BASECAMP_IMAGE_PATH" "$BASECAMP_IMAGE" || exit
podman load "$BASECAMP_IMAGE_PATH" "$BASECAMP_IMAGE" || exit
fi
podman create \
--conmon-pidfile "$BASECAMP_PIDFILE" \
Expand All @@ -85,4 +85,4 @@ if ! podman inspect "$BASECAMP_CONTAINER_NAME" ; then
--env GIN_MODE="${GIN_MODE:-release}" \
"$BASECAMP_IMAGE" || exit
podman inspect "$BASECAMP_CONTAINER_NAME" || exit
fi
fi

0 comments on commit 1e25cd3

Please sign in to comment.