Skip to content

Commit 0815b90

Browse files
authored
Merge branch 'master' into server-follow-symlink
2 parents ecf68b6 + 42bbeca commit 0815b90

File tree

248 files changed

+10526
-7153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

248 files changed

+10526
-7153
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ jobs:
3535

3636
before_deploy:
3737
- make packages
38-
- export DOCKER_PUSH_LATEST=$(echo ${TRAVIS_BRANCH} | grep -E '^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$') || true
39-
- make docker-push
38+
- make docker-push-latest-release
4039

4140
deploy:
4241
provider: releases

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Pull Requests (PRs) are the main and exclusive way to contribute code to source{
3434
In order for a PR to be accepted it needs to pass a list of requirements:
3535

3636
- The contribution must be correctly explained with natural language and providing a minimum working example that reproduces it.
37-
- All PRs must be written idiomaticly:
37+
- All PRs must be written idiomatically:
3838
- for Go: formatted according to [gofmt](https://golang.org/cmd/gofmt/), and without any warnings from [go lint](https://github.com/golang/lint) nor [go vet](https://golang.org/cmd/vet/)
3939
- for other languages, similar constraints apply.
4040
- They should in general include tests, and those shall pass.
@@ -54,4 +54,4 @@ The format can be described more formally as follows:
5454

5555
```
5656
<package>: <subpackage>, <what changed>. [Fixes #<issue-number>]
57-
```
57+
```

Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:stable-slim
1+
FROM alpine:3.8
22

33
COPY build/bin/gitbase /bin
44
RUN mkdir -p /opt/repos
@@ -8,15 +8,11 @@ ENV GITBASE_PASSWORD=""
88
ENV GITBASE_REPOS=/opt/repos
99
EXPOSE 3306
1010

11-
ENV TINI_VERSION v0.17.0
12-
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
11+
ENV TINI_VERSION v0.18.0
12+
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static-amd64 /tini
1313
RUN chmod +x /tini
1414

15-
RUN apt-get update \
16-
&& apt-get -y install libxml2 git \
17-
&& apt-get clean \
18-
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
19-
15+
RUN apk --no-cache add libxml2 git oniguruma libc6-compat
2016

2117
ENTRYPOINT ["/tini", "--"]
2218

0 commit comments

Comments
 (0)