rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial support for native docker client

Browse source 
This commit updates the implementation to use a native docker client as
opposed to calling an external executable.
This commit is contained in:
Tom Wiesing 2023-03-04 09:18:36 +01:00
parent 2ee8dfaaec
commit 1855090f26
No known key found for this signature in database
9 changed files with 379 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

45
cmd/system_update.go
View file

@ -62,6 +62,16 @@ var errBootstrapComponent = exit.Error{
ExitCode: exit.ExitGeneric,
}
var errDockerUnreachable = exit.Error{
Message: "unable to reach docker api: %s",
ExitCode: exit.ExitGeneric,
}
var errNetworkCreateFailed = exit.Error{
Message: "unable to create docker network: %s",
ExitCode: exit.ExitGeneric,
}
func (si systemupdate) Run(context wisski_distillery.Context) error {
dis := context.Environment
@ -101,20 +111,37 @@ func (si systemupdate) Run(context wisski_distillery.Context) error {
}
}
logging.LogMessage(context.Stderr, context.Context, "Checking that 'docker' is installed")
if err := si.mustExec(context, "", "docker", "--version"); err != nil {
return err
// check that the docker api is available
{
logging.LogMessage(context.Stderr, context.Context, "Checking that the 'docker' api is reachable")
ping, err := dis.Docker().Ping(context.Context)
if err != nil {
return errDockerUnreachable.WithMessageF(err)
}
context.Printf("API Version: %s (experimental: %t)\nBuilder Version: %s\n", ping.APIVersion, ping.Experimental, ping.BuilderVersion)
}
logging.LogMessage(context.Stderr, context.Context, "Checking that 'docker compose' is available")
if err := si.mustExec(context, "", "docker", "compose", "version"); err != nil {
return err
{
logging.LogMessage(context.Stderr, context.Context, "Checking that 'docker compose' is available")
if err := si.mustExec(context, "", "docker", "compose", "version"); err != nil {
return err
}
}
// create the docker network
// TODO: Use docker API for this
logging.LogMessage(context.Stderr, context.Context, "Updating Docker Configuration")
si.mustExec(context, "", "docker", "network", "create", dis.Config.Docker.Network)
{
logging.LogMessage(context.Stderr, context.Context, "Configuring docker networks")
name := dis.Config.Docker.Network
id, existed, err := dis.Docker().CreateNetwork(context.Context, name)
if err != nil {
return errNetworkCreateFailed.WithMessageF(err)
}
if existed {
context.Printf("Network %s (id %s) already existed\n", name, id)
} else {
context.Printf("Network %s (id %s) created\n", name, id)
}
}
// install and update the various stacks!
ctx := component.InstallationContext{