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

CASMINST-4471 change podman load to not use -i with new podman #13

Merged
merged 2 commits into from
Apr 23, 2022
Merged
Show file tree
Hide file tree
Changes from all 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 .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