[main] minor cleanup now that this branch is for containerd 1.7+#361
Merged
Conversation
Both containerd and runc have been a module for some time now, and all the branches we care about are a module, so there's no need to set the GO111MODULE env-var. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
The official docker image now have GOTOOLCHAIN=local set by default,
so for stages where we build inside that image, we can remove it;
docker image inspect --format='{{ json .Config.Env }}' golang:1.21.11 | jq .
[
"PATH=/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
"GOLANG_VERSION=1.21.11",
"GOTOOLCHAIN=local",
"GOPATH=/go"
]
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Now that we no longer have to take 1.5/1.6 into account, we must unconditionally disable brtfs for CentOS and RHEL, as no version provides the Linux kernel headers for btrfs Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This condition was added 5 Years ago in c08bd94 because older versions had some issues. CentOS 7 currently installs `2:2.119.2-1.911c772.el7_8`, and CentOS 9 stream has `3:2.231.0-1.el9`; both are higher than the minimum version specified, so let's remove the condition. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Use more current versions of distros in the examples, because CentOS 7 will reach EOL soon, and there's a new Ubuntu LTS release. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
cleanups_for_1.7
branch
from
f2eea0e to
0737507
Compare
Member
Author
dmcgowan
approved these changes
Jun 11, 2024
Member
Author
|
Oh; if you have time; #362 is also an easy review |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Now that the main branch is targeting containerd 1.7, there's some bits we can remove.
remove GOTOOLCHAIN env-vars
Both containerd and runc have been a module for some time now, and all
the branches we care about are a module, so there's no need to set the
GO111MODULE env-var.
remove some GOTOOLCHAIN=local env-vars
The official docker image now have GOTOOLCHAIN=local set by default,
so for stages where we build inside that image, we can remove it;
disable btrfs for all CentOS/RHEL versions
Now that we no longer have to take 1.5/1.6 into account, we must
unconditionally disable brtfs for CentOS and RHEL, as no version
provides the Linux kernel headers for btrfs
rpm: remove version-constraint for container-selinux
This condition was added 5 Years ago in c08bd94
because older versions had some issues.
CentOS 7 currently installs
2:2.119.2-1.911c772.el7_8, and CentOS 9 streamhas
3:2.231.0-1.el9; both are higher than the minimum version specified,so let's remove the condition.
- A picture of a cute animal (not mandatory but encouraged)