mirror of
https://github.com/termux-pacman/termux-packages.git
synced 2025-12-26 13:40:22 +00:00
8a07f912ce
We had to revert docker back to v20.10.23 since the v23.0.x versions were breaking the way containerd was reading the configuration and this results in containerd not being able to correctly start up.
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
--- ./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 @@
|
|
"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"
|
|
)
|
|
|
|
@@ -36,7 +36,7 @@
|
|
|
|
func getHomeDir() string {
|
|
if homeDir == "" {
|
|
- homeDir = homedir.Get()
|
|
+ homeDir = "@TERMUX_HOME@/.docker"
|
|
}
|
|
return homeDir
|
|
}
|
|
@@ -53,10 +52,7 @@
|
|
if configDir != "" {
|
|
return
|
|
}
|
|
- configDir = os.Getenv("DOCKER_CONFIG")
|
|
- if configDir == "" {
|
|
- configDir = filepath.Join(getHomeDir(), configFileDir)
|
|
- }
|
|
+ configDir = "@TERMUX_HOME@/.docker"
|
|
}
|
|
|
|
// Dir returns the directory the configuration file is stored in
|
|
@@ -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()
|