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

add indirect module required for building in FreeBSD ports #39

Merged
merged 1 commit into from
Mar 16, 2023

Conversation

dch
Copy link
Contributor

@dch dch commented Mar 16, 2023

Issue number: n/a
Description of changes: add missing indirect dependency to allow building in FreeBSD ports tree

Testing done:

  • works on my machine (tm)

Terms of contribution:

By submitting this pull request, I agree that this contribution is licensed under the terms found in the LICENSE file.

NB to build this easily, I needed to add a git tag. Doing this has the added
advantage that the FreeBSD ports infrastructure will notify me of any new tags,
to keep the port up to date.

Even a v0.0.0-alpha-12345 would be sufficient.

@dch
Copy link
Contributor Author

dch commented Mar 16, 2023

# ctr image pull --snapshotter zfs public.ecr.aws/samuelkarp/freebsd:13.1-RELEASE
public.ecr.aws/samuelkarp/freebsd:13.1-RELEASE:                                   resolved       |++++++++++++++++++++++++++++++++++++++|
index-sha256:6d39171771533e3702cd67368564d5d2dcf2bebd24003df2ff814aa4c5d889d6:    exists         |++++++++++++++++++++++++++++++++++++++|
manifest-sha256:ea7a4554069ea058b6e6cc495800d24502b8e0cda4feddfd3d116ab297f5ff20: done           |++++++++++++++++++++++++++++++++++++++|
layer-sha256:46f3d931f5af7f4bd06625cec8f8d8633fc5d21acfd9236b3ca4f2b8f141f433:    done           |++++++++++++++++++++++++++++++++++++++|
config-sha256:a7a23666ec0a322705673e135c52fb468f6997f6ba1a141390617086ba23f0ba:   done           |++++++++++++++++++++++++++++++++++++++|
elapsed: 0.9 s                                                                    total:   0.0 B (0.0 B/s)                                  
unpacking freebsd/amd64 sha256:6d39171771533e3702cd67368564d5d2dcf2bebd24003df2ff814aa4c5d889d6...
done: 4.456577ms

# ctr run \
  --snapshotter zfs \
  --runtime wtf.sbk.runj.v1 \
  --rm \
  public.ecr.aws/samuelkarp/freebsd:13.1-RELEASE \
  my-container-id \
  sh -c 'echo "Hello from the container!"'
Hello from the container!

@samuelkarp samuelkarp merged commit 824cf19 into samuelkarp:main Mar 16, 2023
@samuelkarp
Copy link
Owner

Thank you!

Even a v0.0.0-alpha-12345 would be sufficient.

Recent changes are for this! New tag will come when I've completed those.

While I have you here: I'm not sure if the ports build you have builds from a git checkout or a tarball (produced by git archive for example). Go's buildinfo embeds VCS revision data when a binary is built, which runj now reads and includes in its version output. 7aa422d is intended to allow a packager to override the revision through a REV_OVERRIDE file placed in the root of the source tree. Is that sufficient for how you're building the package?

@dch
Copy link
Contributor Author

dch commented Mar 18, 2023

@samuelkarp nice, love those tags!

Here's the way the ports tree does it atm basically go mod download -x all after fetching go.mod
via GOPROXY. I can't really tell but it doesn't play nicely without tags. I
shouldn't need to override the revision at all, the ports tree appends a version
suffix if, on our side, we have to ship a patch (like, when lang/go itself
has been bumped, and the package should be re-built with a newer go version).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants