GitHub Enterprise Support #23

floatdrop · 2014-02-09T14:33:51Z

This pull request allows specify custom GitHub host for enterprise support.

Roadmap:

Introduce domain and api urls in settings (make sure you are using patched version of go-github)
Create fields in account/admin/settings page
Make it link account to enterprise github
Fixed webhook url
Fixed redirect from github_add page
Check if it listens to webhook
Fixup build (do not symlink /tmp directory anywhere)
Fixup commit status in github
Testing in development (due 15.02)

floatdrop · 2014-02-09T17:45:05Z

Seems like our github can't send post request to drone host, but curl can (may be network access problems). I triggered this build by long curl bash line:

However no output was shown in browser. In /var/log/upstart/drone.log I got this:

creating build image
Pulling repository bradrydzewski/node

copying repository to /var/cache/drone/src/github.yandex-team.ru/floatdrop/drone-test
removing build image
failed to completely delete build image . Not Found
2014/02/09 17:38:48 dial tcp :0: connection refused

My .drone.yml:

image: mischief/docker-golang
env:
  - GOROOT=/usr/local/go
  - GOPATH=/var/cache/drone
  - PATH=$GOPATH/bin:$GOPATH/bin:$PATH
script:
  - apt-get -y install libsqlite3-dev sqlite3 mercurial bzr 1> /dev/null 2> /dev/null

bradrydzewski · 2014-02-09T18:51:59Z

awesome work on the patch so far!

it says it is trying to download "bradrydzewski/node" as the image, in your output. I'm wondering if Docker failed to download the image from the index? "bradrydzewski/node" is built on "bradrydzewski/base" which is ~3GB. I've had a lot of problems with the index dropping my connection and failing to complete the download.

regarding the build hook triggering from GitHub. can you check if the hook was successfully added to your repository?

floatdrop · 2014-02-09T19:11:37Z

Yes, hook is added and pointing to the right repository (I hope): http:https://drone.i.fog.yandex.net/hook/github.com?id=github.yandex-team.ru/floatdrop/drone-test.

I tested also docker image from example but results are same:

Pulling repository mischief/docker-golang
copying repository to /var/cache/drone/src/github.yandex-team.ru/floatdrop/drone-test
removing build image
failed to completely delete build image . Not Found

mehulkar · 2014-02-09T19:12:21Z

👍 👍 👍 👍 👍 👍

The sooner I get rid of Jenkins, the happier I will be.

bradrydzewski · 2014-02-09T19:49:09Z

ok, for time being, let's print the docker build command's output to the console to help debug this. just pushed this change: https://github.com/drone/drone/blob/master/pkg/build/docker/image.go#L123

siliconcow · 2014-02-10T01:29:10Z

👍 Another enterprise user that is interested in drone.

wilmoore · 2014-02-10T02:26:03Z

pkg/build/repo/repo.go

@@ -70,9 +70,9 @@ func (r *Repo) IsGit() bool {
 return true
 case strings.HasPrefix(r.Path, "ssh:https://git@"):
 return true
- case strings.HasPrefix(r.Path, "https://github.com/"):
+ case strings.HasPrefix(r.Path, "https://github"):


I wonder if perhaps we don't need this particular branch in the validation?

Seems like case strings.HasSuffix(r.Path, ".git") should be enough while https://github.com/ might be a bit superfluous since I don't believe there is any restriction on hosted github's hostname having to be prefixed with https://github (though it is a nice convention). I believe it is optional to use https (though it is recommended AFAIK).

FYI, I don't see a perfect way to check for a subversion URL repo which github also supports.

floatdrop · 2014-02-10T06:18:09Z

Okay, I pulled the changes and that is what I've got: build: Forbidden path outside the build context: drone (/mnt/tmp/docker-build363257787/drone)

I have my tmp and var folders symlinked to external storage so this caused troubles for me.

bradrydzewski · 2014-02-10T06:53:36Z

I have my tmp and var folders symlinked to external storage so this caused troubles for me.

ahh, that makes sense. As of version 0.8 Docker won't follow symlinks when building an image

2014/02/10 06:15:18 error updating github status: Unauthorized

interesting, sounds like an issue with the github api

floatdrop · 2014-02-10T06:59:53Z

ahh, that makes sense. As of version 0.8 Docker won't follow symlinks when building an image

But how can I move tmp to external device? My default partition is to small for deploying docker builds there.

interesting, sounds like an issue with the github api

I found another go-github client instance, that wasn't pointing to settings.GitHubApiUrl - this is fixed now.

I got question about this block of code - where status variable comes from? I got errored status build in github from success build in drone - this seems strange.

bradrydzewski · 2014-02-10T07:11:34Z

good catch! the switch should actually look like this:

switch commit.Status {

the /tmp directory only stores a few small files during the build process:

the Dockerfile
the Build Script
the Private RSA key

the actual Docker containers and images are stored in /var/lib/docker. Looks like you can change the default location: https://groups.google.com/forum/#!msg/docker-user/AKqf_qIhFL4/HX0-N_H509kJ

floatdrop · 2014-02-10T07:18:31Z

Yes, changing switch is fixed the status reporting. Thank you!

the actual Docker containers and images are stored in /var/lib/docker. Looks like you can change the default location: https://groups.google.com/forum/#!msg/docker-user/AKqf_qIhFL4/HX0-N_H509kJ

I got /var symlinked too 😄

bradrydzewski · 2014-02-10T22:42:03Z

any luck with the Docker issues?

if the pull request is ready I'll merge it this afternoon

floatdrop · 2014-02-11T04:37:46Z

I moved /tmp back to root and used config file for Docker /etc/default/docker to move docker data to var: DOCKER_OPTS="-g /mnt/var/lib/docker". For now I'm waiting for ours admins to fix up access from Github to Drone host (it turned out, that firewall was blocking connections from Github, but allows to connect to Github).

floatdrop · 2014-02-12T06:01:55Z

Feel free to merge. I don't think I will able to solve networking issue anytime soon.

floatdrop · 2014-02-12T09:36:28Z

Good news! We got it up and running. Build takes about 20 seconds from push - and it's awesome!

floatdrop · 2014-02-13T08:14:16Z

So far so good. Can it be merged?

bradrydzewski · 2014-02-14T02:51:45Z

yes, I just need to prepare some sort of database migration. I very much look forward to merging this patch! thanks for all the hard work

floatdrop · 2014-02-14T04:50:29Z

I moved this feature to branch and reopened another pull-request for merge

#23) Abstracting the api/git/web routers will allow us to replace API routing (and potentially web?), while keeping the rest the same.

…lt/CODE/gitness (#23)

wilmoore reviewed Feb 10, 2014
View reviewed changes

floatdrop added 8 commits February 14, 2014 10:46

Added GitHubApiUrl and GitHubDomain to settings and template

2f48023

Put values from settings into handler/auth.go

b7a9c7f

Use custom github domain for webhook

017560f

Update all github clients in code

0c1a5cf

Added settings to github_add page (fix redirect)

52554b4

Fixed identation

99c12a2

Make IsGit check less strict

65bbbb4

Fixed another github client instance in code

7e89478

floatdrop mentioned this pull request Feb 14, 2014

GitHub Enterprise Support #75

Merged

floatdrop closed this Feb 14, 2014

johannesHarness added a commit that referenced this pull request Sep 26, 2023

add specific handlers for api/git/web to allow replacement for harness (

4d3db64

#23) Abstracting the api/git/web routers will allow us to replace API routing (and potentially web?), while keeping the rest the same.

johannesHarness pushed a commit that referenced this pull request Sep 26, 2023

Merge branch 'ui/editor-optimization' of _OKE5H2PQKOUfzFFDuD4FA/defau…

f1ffdad

…lt/CODE/gitness (#23)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

GitHub Enterprise Support #23

GitHub Enterprise Support #23

floatdrop commented Feb 9, 2014

floatdrop commented Feb 9, 2014

bradrydzewski commented Feb 9, 2014

floatdrop commented Feb 9, 2014

mehulkar commented Feb 9, 2014

bradrydzewski commented Feb 9, 2014

siliconcow commented Feb 10, 2014

wilmoore Feb 10, 2014

wilmoore Feb 10, 2014

floatdrop commented Feb 10, 2014

bradrydzewski commented Feb 10, 2014

floatdrop commented Feb 10, 2014

bradrydzewski commented Feb 10, 2014

floatdrop commented Feb 10, 2014

bradrydzewski commented Feb 10, 2014

floatdrop commented Feb 11, 2014

floatdrop commented Feb 12, 2014

floatdrop commented Feb 12, 2014

floatdrop commented Feb 13, 2014

bradrydzewski commented Feb 14, 2014

floatdrop commented Feb 14, 2014

GitHub Enterprise Support #23

GitHub Enterprise Support #23

Conversation

floatdrop commented Feb 9, 2014

floatdrop commented Feb 9, 2014

bradrydzewski commented Feb 9, 2014

floatdrop commented Feb 9, 2014

mehulkar commented Feb 9, 2014

bradrydzewski commented Feb 9, 2014

siliconcow commented Feb 10, 2014

wilmoore Feb 10, 2014

Choose a reason for hiding this comment

wilmoore Feb 10, 2014

Choose a reason for hiding this comment

floatdrop commented Feb 10, 2014

bradrydzewski commented Feb 10, 2014

floatdrop commented Feb 10, 2014

bradrydzewski commented Feb 10, 2014

floatdrop commented Feb 10, 2014

bradrydzewski commented Feb 10, 2014

floatdrop commented Feb 11, 2014

floatdrop commented Feb 12, 2014

floatdrop commented Feb 12, 2014

floatdrop commented Feb 13, 2014

bradrydzewski commented Feb 14, 2014

floatdrop commented Feb 14, 2014