Compare commits
7 Commits
dce72a6ab9
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
78bfcf0261 | ||
|
|
194f3fbd9a | ||
|
|
147c21a19b | ||
|
|
5cb5a78032 | ||
|
|
53314a0896 | ||
|
|
998a84f992 | ||
|
|
59d3a1eec1 |
@@ -7,6 +7,11 @@
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, flake-utils }:
|
||||
{
|
||||
# NixOS module (system-independent)
|
||||
nixosModules.default = import ./module.nix;
|
||||
}
|
||||
//
|
||||
flake-utils.lib.eachDefaultSystem (system:
|
||||
let
|
||||
pkgs = import nixpkgs {
|
||||
@@ -95,9 +100,6 @@
|
||||
DOCKER_BUILDKIT = "1";
|
||||
COMPOSE_DOCKER_CLI_BUILD = "1";
|
||||
};
|
||||
|
||||
# NixOS module for deployment
|
||||
nixosModules.default = import ./module.nix;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
29
module.nix
29
module.nix
@@ -3,9 +3,9 @@
|
||||
let
|
||||
cfg = config.services.usda-vision;
|
||||
|
||||
# Get packages from the flake (self reference)
|
||||
camera-sdk = config.services.usda-vision.package.camera-sdk or pkgs.callPackage ./camera-sdk.nix {};
|
||||
usda-vision-app = config.services.usda-vision.package.usda-vision or pkgs.callPackage ./package.nix {};
|
||||
# Get packages from the package option (must be provided)
|
||||
camera-sdk = cfg.package.camera-sdk;
|
||||
usda-vision-app = cfg.package.usda-vision;
|
||||
in
|
||||
|
||||
{
|
||||
@@ -127,11 +127,30 @@ in
|
||||
/var/lib/usda-vision/docker-compose.yml
|
||||
''}
|
||||
|
||||
${lib.optionalString (cfg.envFile != null) ''
|
||||
# Configure docker-compose to use Nix-provided camera SDK
|
||||
echo "Configuring camera SDK in docker-compose.yml..."
|
||||
${pkgs.gnused}/bin/sed -i \
|
||||
-e '/^ - \/etc\/timezone:\/etc\/timezone:ro$/a\ - ${camera-sdk}/lib:/opt/camera-sdk/lib:ro' \
|
||||
-e 's|LD_LIBRARY_PATH=/usr/local/lib:/lib:/usr/lib|LD_LIBRARY_PATH=/opt/camera-sdk/lib:/usr/local/lib:/lib:/usr/lib|' \
|
||||
/var/lib/usda-vision/docker-compose.yml
|
||||
|
||||
# Fix env_file paths to point to /var/lib/usda-vision/.env
|
||||
echo "Fixing env_file paths in docker-compose.yml..."
|
||||
${pkgs.gnused}/bin/sed -i \
|
||||
's|/var/lib/usda-vision/management-dashboard-web-app/\.env|/var/lib/usda-vision/.env|g' \
|
||||
/var/lib/usda-vision/docker-compose.yml
|
||||
|
||||
# Replace [REDACTED] placeholders with actual VITE_SUPABASE_ANON_KEY reference
|
||||
echo "Fixing ANON_KEY references in docker-compose.yml..."
|
||||
${pkgs.gnused}/bin/sed -i \
|
||||
's|\[REDACTED\]|$${VITE_SUPABASE_ANON_KEY}|g' \
|
||||
/var/lib/usda-vision/docker-compose.yml
|
||||
|
||||
if [ -n "${cfg.envFile}" ]; then
|
||||
echo "Copying environment file from managed secret..."
|
||||
cp ${cfg.envFile} /var/lib/usda-vision/.env
|
||||
chmod 644 /var/lib/usda-vision/.env
|
||||
''}
|
||||
fi
|
||||
|
||||
${lib.optionalString (cfg.envFile == null) ''
|
||||
if [ ! -s /var/lib/usda-vision/.env ]; then
|
||||
|
||||
Reference in New Issue
Block a user