Skip to content

Commit 6f19609

Browse files
authored
Merge pull request #568 from jfontan/disable-static
build: disable static linking and oniguruma
2 parents e7cabf5 + c4572a6 commit 6f19609

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ jobs:
3737
- make packages
3838
- export DOCKER_PUSH_LATEST=$(echo ${TRAVIS_BRANCH} | grep -E '^v[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$') || true
3939
- make docker-push
40-
- make static-package
4140

4241
deploy:
4342
provider: releases

Dockerfile

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,6 @@
1-
FROM golang:1.11-alpine as builder
1+
FROM debian:stable-slim
22

3-
RUN mkdir -p /go/src/github.com/src-d/gitbase
4-
WORKDIR /go/src/github.com/src-d/gitbase
5-
COPY . .
6-
7-
RUN apk add --update libxml2-dev git make bash gcc g++ curl oniguruma-dev
8-
RUN go get github.com/golang/dep/...
9-
RUN dep ensure
10-
RUN cd vendor/gopkg.in/bblfsh/client-go.v2 && make dependencies
11-
RUN make static-build
12-
13-
FROM alpine:3.8
14-
15-
COPY --from=builder /go/bin/gitbase /bin
3+
COPY build/bin/gitbase /bin
164
RUN mkdir -p /opt/repos
175

186
ENV GITBASE_USER=root
@@ -21,9 +9,15 @@ ENV GITBASE_REPOS=/opt/repos
219
EXPOSE 3306
2210

2311
ENV TINI_VERSION v0.17.0
24-
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini-static /tini
12+
ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini
2513
RUN chmod +x /tini
2614

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+
20+
2721
ENTRYPOINT ["/tini", "--"]
2822

2923
CMD gitbase server -v \

0 commit comments

Comments
 (0)