Thanks to visit codestin.com
Credit goes to github.com

Skip to content

scripts: install runc if not found in get script #5505

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.

Sign up for GitHub

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

Merged
openshift-ci merged 2 commits into from
Jul 1, 2022
Merged

scripts: install runc if not found in get script #5505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c57d3b0
scripts: install runc if not found in get script
haircommander Dec 14, 2021
2e3b194
bundle: always install runc
haircommander Dec 14, 2021
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
14 changes: 6 additions & 8 deletions contrib/bundle/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,10 @@ curl_to "$TMP_BIN/conmon" \
"https://github.com/containers/conmon/releases/download/${VERSIONS["conmon"]}/conmon.$ARCH"
chmod +x "$TMP_BIN/conmon"

if [[ $ARCH == "$ARCH_AMD64" ]]; then
# runc
curl_to "$TMP_BIN/runc" \
"https://github.com/opencontainers/runc/releases/download/${VERSIONS["runc"]}/runc.amd64"
chmod +x "$TMP_BIN/runc"
fi
# runc
curl_to "$TMP_BIN/runc" \
"https://github.com/opencontainers/runc/releases/download/${VERSIONS["runc"]}/runc.$ARCH"
chmod +x "$TMP_BIN/runc"

# crun
curl_to "$TMP_BIN/crun" \
Expand Down Expand Up @@ -181,8 +179,8 @@ pushd "$TMPDIR"
export DESTDIR=test/
./install
EXP_CNT=64
if [[ $ARCH == "$ARCH_AMD64" ]]; then
EXP_CNT=65
if ! command -v runc; then
Copy link
Member Author

@haircommander haircommander Dec 14, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@saschagrunert is this still necessary? should we unconditionally install?

Copy link
Member

@saschagrunert saschagrunert Dec 15, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should install it in any case, yes. The benefit would be that we don't use incompatible versions.

EXP_CNT=$((EXP_CNT + 1))
fi
ACT_CNT=$(find test | wc -l)
if [[ "$EXP_CNT" != "$ACT_CNT" ]]; then
Expand Down
3 changes: 2 additions & 1 deletion contrib/bundle/install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ install $SELINUX -D -m 644 -t "$DESTDIR$SYSTEMDDIR" contrib/crio.service
install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/pinns
install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/crun

if [ "$ARCH" = amd64 ]; then
# only install runc if it's not already in the path
if ! command -v runc; then
install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/runc
fi

Expand Down
3 changes: 2 additions & 1 deletion scripts/get
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,8 @@ install $SELINUX -D -m 644 -t "$DESTDIR$SYSTEMDDIR" contrib/crio.service
install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/pinns
install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/crun

if [ "$ARCH" = amd64 ]; then
# only install runc if it's not already in the path
if ! command -v runc; then
install $SELINUX -D -m 755 -t "$DESTDIR$BINDIR" bin/runc
fi

Expand Down