mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-04-26 13:34:45 +00:00
Code Issues Projects Releases Wiki Activity

removed hard-coded Docker socket

Browse source
This commit is contained in:
Brad Rydzewski 2014-07-11 15:39:17 -07:00
parent 3e5035c254
commit eae495534b
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/main.go
View file

@ -94,7 +94,7 @@ func main() {
queue := make(chan *worker.Request) queue := make(chan *worker.Request)
workers := make(chan chan *worker.Request) workers := make(chan chan *worker.Request)
worker.NewDispatch(queue, workers).Start() worker.NewDispatch(queue, workers).Start()
worker.NewWorker(workers, users, repos, commits, configs, pubsub, &model.Server{Host: "unix:///tmp/sock.sock"}).Start() worker.NewWorker(workers, users, repos, commits, configs, pubsub, &model.Server{}).Start()
// setup the session managers // setup the session managers
sess := session.NewSession(users) sess := session.NewSession(users)

11
server/worker/worker.go
View file

@ -110,8 +110,17 @@ func (w *worker) Execute(r *Request) {
Depth: git.GitDepth(script.Git), Depth: git.GitDepth(script.Git),
} }
// Instantiate a new Docker client
var dockerClient *docker.Client
switch {
case len(w.server.Host) == 0:
dockerClient = docker.New()
default:
dockerClient = docker.NewHost(w.server.Host)
}
// create an instance of the Docker builder // create an instance of the Docker builder
builder := build.New(docker.NewHost(w.server.Host)) builder := build.New(dockerClient)
builder.Build = script builder.Build = script
builder.Repo = repo builder.Repo = repo
builder.Stdout = buf builder.Stdout = buf