2021-12-05 15:42:54 +01:00
|
|
|
--- ./cli/cli/config/config.go.orig 2021-11-18 00:49:46.000000000 +0100
|
|
|
|
|
+++ ./cli/cli/config/config.go 2021-12-05 15:25:14.622966748 +0100
|
|
|
|
|
@@ -11,7 +11,6 @@
|
2021-01-24 02:01:06 +01:00
|
|
|
"github.com/docker/cli/cli/config/configfile"
|
|
|
|
|
"github.com/docker/cli/cli/config/credentials"
|
|
|
|
|
"github.com/docker/cli/cli/config/types"
|
|
|
|
|
- "github.com/docker/docker/pkg/homedir"
|
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
|
)
|
|
|
|
|
|
2021-12-05 15:42:54 +01:00
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
|
|
|
|
|
|
func getHomeDir() string {
|
|
|
|
|
if homeDir == "" {
|
|
|
|
|
- homeDir = homedir.Get()
|
|
|
|
|
+ homeDir = "@TERMUX_HOME@/.docker"
|
|
|
|
|
}
|
|
|
|
|
return homeDir
|
|
|
|
|
}
|
|
|
|
|
@@ -53,10 +52,7 @@
|
2021-01-24 02:01:06 +01:00
|
|
|
if configDir != "" {
|
|
|
|
|
return
|
|
|
|
|
}
|
|
|
|
|
- configDir = os.Getenv("DOCKER_CONFIG")
|
|
|
|
|
- if configDir == "" {
|
2021-12-05 15:42:54 +01:00
|
|
|
- configDir = filepath.Join(getHomeDir(), configFileDir)
|
2021-01-24 02:01:06 +01:00
|
|
|
- }
|
2021-12-05 15:42:54 +01:00
|
|
|
+ configDir = "@TERMUX_HOME@/.docker"
|
2021-01-24 02:01:06 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Dir returns the directory the configuration file is stored in
|
2021-12-05 15:42:54 +01:00
|
|
|
@@ -131,7 +131,7 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Can't find latest config file so check for the old one
|
|
|
|
|
- filename = filepath.Join(getHomeDir(), oldConfigfile)
|
|
|
|
|
+ filename = filepath.Join("@TERMUX_HOME@/.docker", oldConfigfile)
|
|
|
|
|
if file, err := os.Open(filename); err == nil {
|
|
|
|
|
printLegacyFileWarning = true
|
|
|
|
|
defer file.Close()
|
