docker-cli: Improve docs, fix enviornment variable
(cherry picked from commit 26e33ea5c0)
This commit is contained in:
parent
7b5a978e00
commit
1e9c01bbbb
3 changed files with 11 additions and 12 deletions
|
|
@ -7,12 +7,11 @@ let
|
|||
in
|
||||
{
|
||||
programs.docker-cli = {
|
||||
configPath = ".docker/empty.json";
|
||||
configDir = ".docker2";
|
||||
};
|
||||
|
||||
nmt.script = ''
|
||||
assertFileNotRegex home-path/etc/profile.d/hm-session-vars.sh 'DOCKER_CONFIG'
|
||||
assertPathNotExists home-files/.docker/config.json
|
||||
assertPathNotExists home-files/${cfgDocker.configPath}
|
||||
assertPathNotExists home-files/${cfgDocker.configDir}
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
programs.docker-cli = {
|
||||
enable = true;
|
||||
|
||||
configPath = ".docker/config2.json";
|
||||
configDir = ".docker2";
|
||||
|
||||
settings = {
|
||||
"proxies" = {
|
||||
|
|
@ -22,8 +22,8 @@
|
|||
nmt.script =
|
||||
let
|
||||
cfgDocker = config.programs.docker-cli;
|
||||
configTestPath = "home-files/${cfgDocker.configPath}";
|
||||
configHomePath = "/home/hm-user/${cfgDocker.configPath}";
|
||||
configTestPath = "home-files/${cfgDocker.configDir}/config.json";
|
||||
configHomePath = "/home/hm-user/${cfgDocker.configDir}";
|
||||
in
|
||||
''
|
||||
assertFileContains home-path/etc/profile.d/hm-session-vars.sh \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue