-
-
Notifications
You must be signed in to change notification settings - Fork 43
Add OCI container extractor #81
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
Open
johnspade
wants to merge
6
commits into
oddlama:main
Choose a base branch
from
johnspade:feat/oci-extractor
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3d45052
feat(extractors/oci-container): Add OCI container extractor
johnspade 066dadc
Add new services
johnspade 9618fd9
Format files
johnspade 573ef9b
Fix forgejo/gitea details
johnspade 7df4845
Add service definition tests
johnspade 74ddc6d
Run service definition tests with nix flake check
johnspade File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| { | ||
| inputs = { | ||
| nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; | ||
| nix-topology.url = "github:oddlama/nix-topology"; | ||
| nix-topology.inputs.nixpkgs.follows = "nixpkgs"; | ||
| }; | ||
|
|
||
| outputs = | ||
| { | ||
| self, | ||
| nixpkgs, | ||
| nix-topology, | ||
| ... | ||
| }: | ||
| { | ||
| nixosConfigurations.host1 = nixpkgs.lib.nixosSystem { | ||
| system = "x86_64-linux"; | ||
| modules = [ | ||
| ( | ||
| { config, ... }: | ||
| { | ||
| networking.hostName = "host1"; | ||
|
|
||
| # Network interfaces from systemd are detected automatically: | ||
| systemd.network.enable = true; | ||
| systemd.network.networks.eth0 = { | ||
| matchConfig.Name = "eth0"; | ||
| }; | ||
|
|
||
| # This node hosts a Jellyfin container | ||
| virtualisation.oci-containers.containers.jellyfin = { | ||
| image = "lscr.io/linuxserver/jellyfin:10.10.3"; | ||
| labels = { | ||
| "traefik.http.routers.jellyfin.rule" = "Host(`jellyfin.example.com`)"; | ||
| }; | ||
| }; | ||
|
|
||
| # Use a built-in function to extract the host information from the container labels | ||
| topology.extractors.oci-container.infoFn = | ||
| config.topology.extractors.oci-container.lib.traefikHostInfoFn; | ||
|
|
||
| # Define a custom details function to extract and show additional information | ||
| topology.extractors.oci-container.detailsFn = c: { image.text = c.image; }; | ||
| } | ||
| ) | ||
| nix-topology.nixosModules.default | ||
| ]; | ||
| }; | ||
| } | ||
| // ( | ||
| let | ||
| forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed; | ||
| in | ||
| { | ||
| topology = forAllSystems ( | ||
| system: | ||
| let | ||
| pkgs = import nixpkgs { | ||
| inherit system; | ||
| overlays = [ nix-topology.overlays.default ]; | ||
| }; | ||
| in | ||
| import nix-topology { | ||
| inherit pkgs; | ||
| modules = [ | ||
| ( | ||
| { config, ... }: | ||
| let | ||
| inherit (config.lib.topology) mkInternet mkConnection; | ||
| in | ||
| { | ||
| inherit (self) nixosConfigurations; | ||
| nodes.internet = mkInternet { connections = mkConnection "host1" "eth0"; }; | ||
| } | ||
| ) | ||
| ]; | ||
| } | ||
| ); | ||
| } | ||
| ); | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Currently this fails to build using
nix build <flake>#docsbecause flake-utils is not a flake input. I would simply omit using it hereThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, omited it, it was a leftover from before flake-utils were removed from the project