docker-compose up wants an env file instead of -e
This commit is contained in:
parent
376b9e3199
commit
9a5d54aa13
|
@ -117,7 +117,24 @@ in
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
config =
|
||||||
|
let
|
||||||
|
satnogs-cfg-docker-env = pkgs.writeTextFile {
|
||||||
|
name = "satnogs-cfg-docker-env";
|
||||||
|
text = concatStringsSep "\n" (mapAttrsToList (k: v: if v != "" then "${k}=${v}" else "") {
|
||||||
|
SATNOGS_API_TOKEN = cfg.satnogs-api-token;
|
||||||
|
SATNOGS_SOAPY_RX_DEVICE = cfg.satnogs-soapy-rx-device;
|
||||||
|
SATNOGS_ANTENNA = cfg.satnogs-antenna;
|
||||||
|
SATNOGS_RX_SAMP_RATE = cfg.satnogs-rx-samp-rate;
|
||||||
|
SATNOGS_RF_GAIN = cfg.satnogs-rf-gain;
|
||||||
|
SATNOGS_STATION_ELEV = cfg.satnogs-station-elev;
|
||||||
|
SATNOGS_STATION_ID = cfg.satnogs-station-id;
|
||||||
|
SATNOGS_STATION_LAT = cfg.satnogs-station-lat;
|
||||||
|
SATNOGS_STATION_LON = cfg.satnogs-station-lon;
|
||||||
|
});
|
||||||
|
};
|
||||||
|
in
|
||||||
|
mkIf cfg.enable {
|
||||||
warnings =
|
warnings =
|
||||||
if (cfg.satnogs-api-token != "") then
|
if (cfg.satnogs-api-token != "") then
|
||||||
[
|
[
|
||||||
|
@ -131,18 +148,8 @@ in
|
||||||
script = concatStringsSep " \\\n " ([
|
script = concatStringsSep " \\\n " ([
|
||||||
"${pkgs.docker-compose}/bin/docker-compose"
|
"${pkgs.docker-compose}/bin/docker-compose"
|
||||||
"-f ${./satnogs-docker-compose.yml}"
|
"-f ${./satnogs-docker-compose.yml}"
|
||||||
|
"--env-file ${satnogs-cfg-docker-env}"
|
||||||
]
|
]
|
||||||
++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") {
|
|
||||||
SATNOGS_API_TOKEN = cfg.satnogs-api-token;
|
|
||||||
SATNOGS_SOAPY_RX_DEVICE = cfg.satnogs-soapy-rx-device;
|
|
||||||
SATNOGS_ANTENNA = cfg.satnogs-antenna;
|
|
||||||
SATNOGS_RX_SAMP_RATE = cfg.satnogs-rx-samp-rate;
|
|
||||||
SATNOGS_RF_GAIN = cfg.satnogs-rf-gain;
|
|
||||||
SATNOGS_STATION_ELEV = cfg.satnogs-station-elev;
|
|
||||||
SATNOGS_STATION_ID = cfg.satnogs-station-id;
|
|
||||||
SATNOGS_STATION_LAT = cfg.satnogs-station-lat;
|
|
||||||
SATNOGS_STATION_LON = cfg.satnogs-station-lon;
|
|
||||||
})
|
|
||||||
++ map (f: "--env-file ${escapeShellArg f}") cfg.additional-env-files
|
++ map (f: "--env-file ${escapeShellArg f}") cfg.additional-env-files
|
||||||
++ [ "up" ]);
|
++ [ "up" ]);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue