Add more Ubuntu versions and Debian support #439
Merged
Conversation
This file contains 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
cpuguy83
force-pushed
the
MOAR_UBUNTU
branch
from
2931700 to
5eee3e7
Compare
Merged
sozercan
reviewed
Nov 21, 2024
cpuguy83
force-pushed
the
MOAR_UBUNTU
branch
3 times, most recently
from
d5b0051 to
0c81590
Compare
adamperlin
requested changes
Nov 27, 2024
|
Updated with suggestions. |
adamperlin
reviewed
Dec 3, 2024
| @@ -79,6 +79,7 @@ func (cfg *Config) Worker(sOpt dalec.SourceOpts, opts ...llb.ConstraintsOpt) (ll | |||
| Run( | |||
| dalec.WithConstraints(opts...), | |||
| AptInstall(cfg.BuilderPackages, opts...), | |||
| dalec.WithMountedAptCache(cfg.AptCachePrefix), | |||
There was a problem hiding this comment.
Was this just not using the shared apt cache before?
There was a problem hiding this comment.
Yes, somehow got left out when I moved things around.
adamperlin
reviewed
Dec 3, 2024
adamperlin
reviewed
Dec 3, 2024
adamperlin
reviewed
Dec 3, 2024
adamperlin
approved these changes
Dec 3, 2024
This is just shifting some bits raound to make more sense for adding other Ubuntu versions. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Older versions of Go that supported go modules didn't neccessarily support the `GOMODCACHE` env var. This change works around this limitation by linking our fetched go modules into the configured `$GOPATH` when this is the case. Additionally updates the gomod generator to not rely on `$GOMODCACHE`. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This prepares the deb packaging to allow worker images to update $PATH and make sure that is passed along to the build scripts so that the source package is more likely to be reproducible. This will be useful for supporting non-standard go packages in Ubuntu such as `golang-<ver>` which do not add the go bins anywhere in the standard $PATH. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Sometimes the `golang` package is just very old, but there may be other packages available like `golang-<ver>`, however those do not typically install the `go` binary such that it would be available in $PATH. This autoamtically looks up go and sets $PATH to include go in that path, but only when there is a `golang-<ver>` package in the dependency list. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
The package is not available on all debian distros but is instead listed as a `Provides` from the `debhelper` package. The debhelper-compat build dep is still part of the generated debian control file so the compat level is still ensured. This is required to support distros that do not have an explicit package called `debhelper-compat` and instead only lists it in the `Provides` section of the `debhelper` package. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Adds 18.04, 20.04, and 24.04 (in addition to 22.04 which was already there). For tests, given that Ubuntu <= 20.04 have a "golang" package that is too old to run the tests, I added a way to override the package name used in the test. Another minor modification due to Bionic not supporting `execute_after_dh_fixperms`. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This adds Debian Bullseye and Bookworm support. The only real change needed here was to update the distro config to allow us to enable the `bullseye-backports` repo so the tests can install a more recent version of go (and as such pass the test). Signed-off-by: Brian Goff <cpuguy83@gmail.com>
This makes the build a bit more friendly to building outside of DALEC where we don't mess with *their* $PATH except by adding the paths we need instead of replacing the whole thing. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Individual commits detail each change.
Basically:
GOMODCACHEenv vargointo $PATH