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

Commit 3ebb830

Browse files
author
Denys Smirnov
committed
update the build script
Signed-off-by: Denys Smirnov <[email protected]>
1 parent 845a222 commit 3ebb830

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

Dockerfile

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,24 +39,23 @@ ADD driver $DRIVER_REPO_PATH/driver
3939

4040
WORKDIR $DRIVER_REPO_PATH/
4141

42-
# build tests
43-
RUN go test -c -o /tmp/fixtures.test ./driver/fixtures/
4442
# build server binary
4543
RUN go build -o /tmp/driver ./driver/main.go
44+
# build tests
45+
RUN go test -c -o /tmp/fixtures.test ./driver/fixtures/
4646

4747
#=======================
4848
# Stage 3: Driver Build
4949
#=======================
5050
FROM openjdk:8-jre-alpine
5151

52+
53+
5254
LABEL maintainer="source{d}" \
5355
bblfsh.language="java"
5456

5557
WORKDIR /opt/driver
5658

57-
# copy driver manifest and static files
58-
ADD .manifest.release.toml ./etc/manifest.toml
59-
6059
# copy static files from driver source directory
6160
ADD ./native/src/main/sh/native.sh ./bin/native
6261

@@ -65,13 +64,16 @@ ADD ./native/src/main/sh/native.sh ./bin/native
6564
COPY --from=native /native/target/native-jar-with-dependencies.jar ./bin/
6665

6766

67+
# copy driver server binary
68+
COPY --from=driver /tmp/driver ./bin/
69+
6870
# copy tests binary
6971
COPY --from=driver /tmp/fixtures.test ./bin/
7072
# move stuff to make tests work
7173
RUN ln -s /opt/driver ../build
7274
VOLUME /opt/fixtures
7375

74-
# copy driver server binary
75-
COPY --from=driver /tmp/driver ./bin/
76+
# copy driver manifest and static files
77+
ADD .manifest.release.toml ./etc/manifest.toml
7678

7779
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.

0 commit comments

Comments
 (0)