-
Notifications
You must be signed in to change notification settings - Fork 0
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
Reorganize modules to match ghaf mainline stucture #37
Conversation
buianhhuy96
commented
Apr 23, 2024
- Move and rename some modules
29fa5ec
to
744d0b6
Compare
744d0b6
to
448ab16
Compare
flake.nix
Outdated
(import ./installers/fmo-os-installer-public.nix) | ||
]; | ||
|
||
#TODO Fix this |
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.
Leftovers?
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.
Ok. I should fix this, this comment belongs to ghaf mainline, I think they may run into some issue
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.
Than please give more meaningful comment here like and put down here that it belongs to ghaf mainline
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.
After checking it, I think we can delete it and update it when the mainline changes. It is just a syntax where they want to use import
so nothing really affects us
@@ -92,9 +93,10 @@ | |||
microvm.qemu.bios.enable = false; | |||
microvm.storeDiskType = "squashfs"; | |||
|
|||
imports = (import "${ghafOS}/modules/module-list.nix") ++ (import ../../fmo-module-list.nix); | |||
imports = (import "${ghafOS}/modules/module-list.nix"); |
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.
How that works now?
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.
This works thanks to self.nixosModules.fmo-configs
in line 44, which is define in the new fmo-module-list.nix
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.
Oh, okay, thanks!
# | ||
# Allows us to structure the flake with the NixOS module system | ||
flake-parts = { | ||
url = "github:hercules-ci/flake-parts"; |
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.
What this for?
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.
This is to sync with ghaf mainline structure, where they modularize everything with self.nixosModules
- Move and rename some modules matching ghaf mainline structure - Create separate folder for hydrajobs - Modularize with flake-parts - Rewrite target config with flake-part modules Signed-off-by: Anh Huy Bui <[email protected]>
448ab16
to
99f3a70
Compare
Signed-off-by: Ivan Kuznetsov <[email protected]>
Signed-off-by: Ivan Kuznetsov <[email protected]>
- Add host ipaddr and default route to configuration - Add updateHostConfig functionality Signed-off-by: Ivan Kuznetsov <[email protected]>
- Check if update docker-compose file exist - If so then backup original file - And update original docker-compose file with a new one Signed-off-by: Ivan Kuznetsov <[email protected]>
… from file - Use default CR URL if file does not exist - Use CR URL from file if it exists Signed-off-by: Ivan Kuznetsov <[email protected]>
- Update new installer version with docker url selection - Add installer configs for docker URLs Signed-off-by: Anh Huy Bui <[email protected]>