Skip to content

Commit f669c77

Browse files
committed
Merge pull request #171 from aledbf/remove-fetcher
ref(builder): remove fetcher
2 parents 11869e8 + 00a5199 commit f669c77

4 files changed

Lines changed: 0 additions & 78 deletions

File tree

boot.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66

77
cookoolog "github.com/Masterminds/cookoo/log"
88
"github.com/codegangsta/cli"
9-
"github.com/deis/builder/fetcher"
109
"github.com/deis/builder/pkg"
1110
"github.com/deis/builder/pkg/conf"
1211
"github.com/deis/builder/pkg/gitreceive"
@@ -43,8 +42,6 @@ func main() {
4342
pkglog.Err("getting config for %s [%s]", serverConfAppName, err)
4443
os.Exit(1)
4544
}
46-
pkglog.Info("starting fetcher on port %d", cnf.FetcherPort)
47-
go fetcher.Serve(cnf.FetcherPort)
4845
pkglog.Info("starting SSH server on %s:%d", cnf.SSHHostIP, cnf.SSHHostPort)
4946
os.Exit(pkg.Run(cnf.SSHHostIP, cnf.SSHHostPort, "boot"))
5047
},

fetcher/fetcher.go

Lines changed: 0 additions & 73 deletions
This file was deleted.

pkg/sshd/config.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package sshd
22

33
// Config represents the required SSH server configuration
44
type Config struct {
5-
FetcherPort int `envconfig:"FETCHER_PORT" default:"3000" required:"true"`
65
SSHHostIP string `envconfig:"SSH_HOST_IP" default:"0.0.0.0" required:"true"`
76
SSHHostPort int `envconfig:"SSH_HOST_PORT" default:"2223" required:"true"`
87
}

rootfs/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ENV GITHOME /home/git
55
ENV GITUSER git
66
# this is so the minio client (https://github.com/minio/mc) works properly
77
ENV DOCKERIMAGE=1
8-
ENV DEIS_BUILDER_SERVER_FETCHER_PORT=3000
98
ENV DEIS_BUILDER_SERVER_SSH_HOST_IP=0.0.0.0
109
ENV DEIS_BUILDER_SERVER_SSH_HOST_PORT=2223
1110

0 commit comments

Comments
 (0)