Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Commit bfb5604

Browse files
author
Denys Smirnov
committed
don't use the custom base image
Signed-off-by: Denys Smirnov <[email protected]>
1 parent 053b402 commit bfb5604

File tree

3 files changed

+15
-10
lines changed

3 files changed

+15
-10
lines changed

Dockerfile

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,24 +35,24 @@ ADD driver $DRIVER_REPO_PATH/driver
3535

3636
WORKDIR $DRIVER_REPO_PATH/
3737

38-
# build tests
39-
RUN go test -c -o /tmp/fixtures.test ./driver/fixtures/
4038
# build server binary
4139
RUN go build -o /tmp/driver ./driver/main.go
40+
# build tests
41+
RUN go test -c -o /tmp/fixtures.test ./driver/fixtures/
4242

4343
#=======================
4444
# Stage 3: Driver Build
4545
#=======================
46-
FROM dennwc/python:3.6-2.7-alpine
46+
FROM python:3.6-alpine
47+
48+
RUN apk add python2
49+
4750

4851
LABEL maintainer="source{d}" \
4952
bblfsh.language="python"
5053

5154
WORKDIR /opt/driver
5255

53-
# copy driver manifest and static files
54-
ADD .manifest.release.toml ./etc/manifest.toml
55-
5656
# copy static files from driver source directory
5757
ADD ./native/sh/native.sh ./bin/native
5858

@@ -61,13 +61,16 @@ ADD ./native/sh/native.sh ./bin/native
6161
COPY --from=native /native/.local ./bin/.local
6262

6363

64+
# copy driver server binary
65+
COPY --from=driver /tmp/driver ./bin/
66+
6467
# copy tests binary
6568
COPY --from=driver /tmp/fixtures.test ./bin/
6669
# move stuff to make tests work
6770
RUN ln -s /opt/driver ../build
6871
VOLUME /opt/fixtures
6972

70-
# copy driver server binary
71-
COPY --from=driver /tmp/driver ./bin/
73+
# copy driver manifest and static files
74+
ADD .manifest.release.toml ./etc/manifest.toml
7275

7376
ENTRYPOINT ["/opt/driver/bin/driver"]

Gopkg.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ sdk: '2'
22
go-runtime:
33
version: '1.10-alpine'
44
native:
5-
image: 'dennwc/python:3.6-2.7-alpine'
5+
image: 'python:3.6-alpine'
6+
deps:
7+
- 'apk add python2'
68
static:
79
- path: 'sh/native.sh'
810
dest: 'native'

0 commit comments

Comments
 (0)