diff options
| -rw-r--r-- | .dockerignore | 21 | ||||
| -rw-r--r-- | Dockerfile | 2 | ||||
| -rw-r--r-- | Dockerfile.rpi | 11 | ||||
| -rw-r--r-- | docker/README.md | 2 | ||||
| -rwxr-xr-x | docker/build.sh | 2 | ||||
| -rw-r--r-- | routers/repo/pull.go | 19 |
6 files changed, 32 insertions, 25 deletions
diff --git a/.dockerignore b/.dockerignore index 8822b343..092eef43 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,20 +1,21 @@ .git -.git/ -.git/* +.git/** conf -conf/ -conf/* +conf/** packager -packager/ -packager/* +packager/** scripts -scripts/ -scripts/* +scripts/** +.github/ +.github/** +config.codekit +LICENSE +Makefile +.dockerignore *.yml *.md .bra.toml .editorconfig .gitignore .gopmfile -config.codekit -LICENSE +Dockerfile* @@ -2,7 +2,7 @@ FROM alpine:3.3 MAINTAINER jp@roemer.im # Install system utils & Gogs runtime dependencies -ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-amd64 /usr/sbin/gosu +ADD https://github.com/tianon/gosu/releases/download/1.7/gosu-amd64 /usr/sbin/gosu RUN chmod +x /usr/sbin/gosu \ && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat diff --git a/Dockerfile.rpi b/Dockerfile.rpi index fb13645c..6e2c4264 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -2,13 +2,12 @@ FROM hypriot/rpi-alpine-scratch:v3.2 MAINTAINER jp@roemer.im, raxetul@gmail.com # Install system utils & Gogs runtime dependencies -ADD https://github.com/tianon/gosu/releases/download/1.6/gosu-armhf /usr/sbin/gosu -RUN echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/" | tee /etc/apk/repositories \ +ADD https://github.com/tianon/gosu/releases/download/1.7/gosu-armhf /usr/sbin/gosu +RUN chmod +x /usr/sbin/gosu \ + && echo "http://dl-4.alpinelinux.org/alpine/v3.3/main/" | tee /etc/apk/repositories \ && echo "http://dl-4.alpinelinux.org/alpine/v3.3/community/" | tee -a /etc/apk/repositories \ - && echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/repositories \ - && apk -U --no-progress upgrade \ - && apk -U --no-progress add ca-certificates bash git linux-pam s6@edge curl openssh socat \ - && chmod +x /usr/sbin/gosu + && apk -U --no-progress upgrade && rm -f /var/cache/apk/APKINDEX.* \ + && apk --no-cache --no-progress add ca-certificates bash git linux-pam s6 curl openssh socat ENV GOGS_CUSTOM /data/gogs diff --git a/docker/README.md b/docker/README.md index af6dfc7a..bfdb4a60 100644 --- a/docker/README.md +++ b/docker/README.md @@ -88,4 +88,4 @@ Steps to upgrade Gogs with Docker: ## Known Issues -- `.dockerignore` seems to be ignored during Docker Hub Automated build +- The docker container can not currently be build on Raspberry 1 (armv6l) as our base image `alpine` does not have a `go` package available for this platform. diff --git a/docker/build.sh b/docker/build.sh index e109affc..0bf5c013 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -7,7 +7,7 @@ export GOPATH=/tmp/go export PATH=${PATH}:${GOPATH}/bin # Install build deps -apk -U --no-progress add --virtual build-deps linux-pam-dev go gcc musl-dev +apk --no-cache --no-progress add --virtual build-deps linux-pam-dev go gcc musl-dev # Init go environment to build Gogs mkdir -p ${GOPATH}/src/github.com/gogits/ diff --git a/routers/repo/pull.go b/routers/repo/pull.go index cf8c4829..58acb175 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -623,7 +623,7 @@ func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueFor return } - pull := &models.Issue{ + pullIssue := &models.Issue{ RepoID: repo.ID, Index: repo.NextIssueIndex(), Name: form.Title, @@ -634,26 +634,33 @@ func CompareAndPullRequestPost(ctx *middleware.Context, form auth.CreateIssueFor IsPull: true, Content: form.Content, } - if err := models.NewPullRequest(repo, pull, labelIDs, attachments, &models.PullRequest{ + pullRequest := &models.PullRequest{ HeadRepoID: headRepo.ID, BaseRepoID: repo.ID, HeadUserName: headUser.Name, HeadBranch: headBranch, BaseBranch: baseBranch, + HeadRepo: headRepo, + BaseRepo: repo, MergeBase: prInfo.MergeBase, Type: models.PULL_REQUEST_GOGS, - }, patch); err != nil { + } + if err := models.NewPullRequest(repo, pullIssue, labelIDs, attachments, pullRequest, patch); err != nil { ctx.Handle(500, "NewPullRequest", err) return } + if err := pullRequest.PushToBaseRepo(); err != nil { + ctx.Handle(500, "PushToBaseRepo", err) + return + } - notifyWatchersAndMentions(ctx, pull) + notifyWatchersAndMentions(ctx, pullIssue) if ctx.Written() { return } - log.Trace("Pull request created: %d/%d", repo.ID, pull.ID) - ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pull.Index)) + log.Trace("Pull request created: %d/%d", repo.ID, pullIssue.ID) + ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(pullIssue.Index)) } func TriggerTask(ctx *middleware.Context) { |