mirror of
https://code.forgejo.org/forgejo/runner.git
synced 2024-12-18 03:42:09 +03:00
refactor: docker engine with options
This commit is contained in:
parent
4eb5213294
commit
14a345504f
3 changed files with 45 additions and 18 deletions
|
@ -137,8 +137,7 @@ func runDaemon(ctx context.Context, input *Input) func(cmd *cobra.Command, args
|
|||
|
||||
initLogging(cfg)
|
||||
|
||||
opts := engine.Opts{}
|
||||
engine, err := engine.NewEnv(opts)
|
||||
engine, err := engine.New()
|
||||
if err != nil {
|
||||
log.WithError(err).
|
||||
Fatalln("cannot load the docker engine")
|
||||
|
@ -161,7 +160,7 @@ func runDaemon(ctx context.Context, input *Input) func(cmd *cobra.Command, args
|
|||
count++
|
||||
if count == 5 {
|
||||
log.WithError(err).
|
||||
Fatalln("retry count reached")
|
||||
Fatalf("retry count reached: %d", count)
|
||||
}
|
||||
time.Sleep(time.Second)
|
||||
} else {
|
||||
|
|
|
@ -6,30 +6,28 @@ import (
|
|||
"github.com/docker/docker/client"
|
||||
)
|
||||
|
||||
// Opts configures the Docker engine.
|
||||
type Opts struct {
|
||||
HidePull bool
|
||||
}
|
||||
|
||||
type Docker struct {
|
||||
client client.APIClient
|
||||
hidePull bool
|
||||
}
|
||||
|
||||
func New(client client.APIClient, opts Opts) *Docker {
|
||||
return &Docker{
|
||||
client: client,
|
||||
hidePull: opts.HidePull,
|
||||
}
|
||||
}
|
||||
|
||||
// NewEnv returns a new Engine from the environment.
|
||||
func NewEnv(opts Opts) (*Docker, error) {
|
||||
func New(opts ...Option) (*Docker, error) {
|
||||
cli, err := client.NewClientWithOpts(client.FromEnv)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return New(cli, opts), nil
|
||||
|
||||
srv := &Docker{
|
||||
client: cli,
|
||||
}
|
||||
|
||||
// Loop through each option
|
||||
for _, opt := range opts {
|
||||
// Call the option giving the instantiated
|
||||
opt.Apply(srv)
|
||||
}
|
||||
|
||||
return srv, nil
|
||||
}
|
||||
|
||||
// Ping pings the Docker daemon.
|
||||
|
|
30
engine/options.go
Normal file
30
engine/options.go
Normal file
|
@ -0,0 +1,30 @@
|
|||
package engine
|
||||
|
||||
import "github.com/docker/docker/client"
|
||||
|
||||
// An Option configures a mutex.
|
||||
type Option interface {
|
||||
Apply(*Docker)
|
||||
}
|
||||
|
||||
// OptionFunc is a function that configure a value.
|
||||
type OptionFunc func(*Docker)
|
||||
|
||||
// Apply calls f(option)
|
||||
func (f OptionFunc) Apply(docker *Docker) {
|
||||
f(docker)
|
||||
}
|
||||
|
||||
// WithClient set custom client
|
||||
func WithClient(c client.APIClient) Option {
|
||||
return OptionFunc(func(q *Docker) {
|
||||
q.client = c
|
||||
})
|
||||
}
|
||||
|
||||
// WithHidePull set custom client
|
||||
func WithHidePull(v bool) Option {
|
||||
return OptionFunc(func(q *Docker) {
|
||||
q.hidePull = v
|
||||
})
|
||||
}
|
Loading…
Reference in a new issue