Skip to content

[main] deb, rpm: fix runc using incorrect version #385

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
thaJeztah merged 1 commit into from
Aug 8, 2024
Merged

[main] deb, rpm: fix runc using incorrect version #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ binaries: ## Create containerd binaries
rm -f bin/containerd-stress

bin/runc:
@set -x; make -C /go/src/github.com/opencontainers/runc --no-print-directory \
# Unset the VERSION variable as it's meant for containerd's version, not runc.
@set -x; env -u VERSION make -C /go/src/github.com/opencontainers/runc --no-print-directory \
BINDIR="$$(pwd)/bin" \
runc install

Expand Down
3 changes: 2 additions & 1 deletion rpm/containerd.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ rm -f bin/containerd-stress
bin/containerd --version
bin/ctr --version

make -C /go/src/github.com/opencontainers/runc BINDIR=%{_builddir}/bin runc install
# Unset the VERSION variable as it's meant for containerd's version, not runc.
env -u VERSION make -C /go/src/github.com/opencontainers/runc BINDIR=%{_builddir}/bin runc install


%install
Expand Down