kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #42465 from thaJeztah/no_sushi_today

Browse source 
libnetwork: replace BurntSushi/toml with pelletier/go-toml
This commit is contained in:
Sebastiaan van Stijn 2021-06-05 15:56:29 +02:00 committed by GitHub
commit 58f0a1597d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/cmd/dnet/dnet.go
View file

@ -19,7 +19,6 @@ import (
"syscall"
"time"
"github.com/BurntSushi/toml"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/libnetwork"
"github.com/docker/docker/libnetwork/api"
@ -35,6 +34,7 @@ import (
"github.com/docker/docker/pkg/reexec"
"github.com/gorilla/mux"
"github.com/moby/term"
"github.com/pelletier/go-toml"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
@ -70,7 +70,11 @@ func main() {
func (d *dnetConnection) parseOrchestrationConfig(tomlCfgFile string) error {
dummy := &dnetConnection{}
if _, err := toml.DecodeFile(tomlCfgFile, dummy); err != nil {
data, err := ioutil.ReadFile(tomlCfgFile)
if err != nil {
return err
}
if err := toml.Unmarshal(data, dummy); err != nil {
return err
}

10
libnetwork/config/config.go
View file

@ -2,9 +2,9 @@ package config
import (
"fmt"
"io/ioutil"
"strings"
"github.com/BurntSushi/toml"
"github.com/docker/docker/libnetwork/cluster"
"github.com/docker/docker/libnetwork/datastore"
"github.com/docker/docker/libnetwork/ipamutils"
@ -15,6 +15,7 @@ import (
"github.com/docker/docker/pkg/plugingetter"
"github.com/docker/go-connections/tlsconfig"
"github.com/docker/libkv/store"
"github.com/pelletier/go-toml"
"github.com/sirupsen/logrus"
)
@ -70,8 +71,11 @@ func ParseConfig(tomlCfgFile string) (*Config, error) {
cfg := &Config{
Scopes: map[string]*datastore.ScopeCfg{},
}
if _, err := toml.DecodeFile(tomlCfgFile, cfg); err != nil {
data, err := ioutil.ReadFile(tomlCfgFile)
if err != nil {
return nil, err
}
if err := toml.Unmarshal(data, cfg); err != nil {
return nil, err
}