Skip to content

Commit 21eb9b4

Browse files
authored
Merge pull request #596 from Lerentis/master
Refactored Dockerfile
2 parents a18673c + 581a9a0 commit 21eb9b4

File tree

2 files changed

+5
-9
lines changed

2 files changed

+5
-9
lines changed

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 --no-install-recommends 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

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $(MAKEFILE):
1818

1919
# we still need to do this for windows
2020
bblfsh-client:
21-
cd vendor/gopkg.in/bblfsh/client-go.v2 && make dependencies
21+
cd vendor/gopkg.in/bblfsh/client-go.v3 && make dependencies
2222

2323
dependencies: bblfsh-client
2424

0 commit comments

Comments
 (0)