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

Commit 71798fa

Browse files
Denys Smirnovdennwc
authored andcommitted
update sdk and pin openjdk version
Signed-off-by: Denys Smirnov <[email protected]>
1 parent acbb016 commit 71798fa

File tree

6 files changed

+130
-21
lines changed

6 files changed

+130
-21
lines changed

Dockerfile

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#==============================
1313
# Stage 1: Native Driver Build
1414
#==============================
15-
FROM openjdk:8-slim as native
15+
FROM openjdk:8u181-slim as native
1616

1717
# install build dependencies
1818
RUN apt update && apt install -y maven
@@ -29,14 +29,15 @@ RUN mvn package
2929
# Stage 1.1: Native Driver Tests
3030
#================================
3131
FROM native as native_test
32+
3233
# run native driver tests
3334
RUN mvn test
3435

3536

3637
#=================================
3738
# Stage 2: Go Driver Server Build
3839
#=================================
39-
FROM golang:1.10-alpine as driver
40+
FROM golang:1.12-alpine as driver
4041

4142
ENV DRIVER_REPO=github.com/bblfsh/java-driver
4243
ENV DRIVER_REPO_PATH=/go/src/$DRIVER_REPO
@@ -49,6 +50,9 @@ WORKDIR $DRIVER_REPO_PATH/
4950

5051
ENV GO111MODULE=on GOFLAGS=-mod=vendor
5152

53+
# workaround for https://github.com/golang/go/issues/28065
54+
ENV CGO_ENABLED=0
55+
5256
# build server binary
5357
RUN go build -o /tmp/driver ./driver/main.go
5458
# build tests
@@ -57,7 +61,7 @@ RUN go test -c -o /tmp/fixtures.test ./driver/fixtures/
5761
#=======================
5862
# Stage 3: Driver Build
5963
#=======================
60-
FROM openjdk:8-jre-alpine
64+
FROM openjdk:8u181-jre-alpine
6165

6266

6367

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Java driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/java-driver.svg?branch=master)](https://travis-ci.org/bblfsh/java-driver) ![Native Version](https://img.shields.io/badge/java%20version-8.171.11--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.12-63afbf.svg)
1+
# Java driver for [Babelfish](https://github.com/bblfsh/bblfshd) ![Driver Status](https://img.shields.io/badge/status-beta-dbd25c.svg) [![Build Status](https://travis-ci.org/bblfsh/java-driver.svg?branch=master)](https://travis-ci.org/bblfsh/java-driver) ![Native Version](https://img.shields.io/badge/java%20version-8u181-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.12-63afbf.svg)
22

33
Development Environment
44
-----------------------

build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
sdk: '2'
22
language: java
33
go-runtime:
4-
version: '1.10-alpine'
4+
version: '1.12-alpine'
55
native:
6-
image: 'openjdk:8-jre-alpine'
6+
image: 'openjdk:8u181-jre-alpine'
77
static:
88
- path: 'native.sh'
99
dest: 'native'
1010
build:
11-
image: 'openjdk:8-slim'
11+
image: 'openjdk:8u181-slim'
1212
deps:
1313
- 'apt update && apt install -y maven'
1414
run:

go.mod

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,31 @@ go 1.12
44

55
require (
66
github.com/Microsoft/go-winio v0.4.12 // indirect
7-
github.com/bblfsh/sdk/v3 v3.0.0
8-
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
9-
github.com/gogo/protobuf v1.1.1 // indirect
7+
github.com/bblfsh/sdk/v3 v3.1.0
8+
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
9+
github.com/docker/go-connections v0.4.0 // indirect
10+
github.com/docker/go-units v0.4.0 // indirect
11+
github.com/gogo/protobuf v1.2.1 // indirect
12+
github.com/google/go-cmp v0.3.0 // indirect
13+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
14+
github.com/mattn/go-colorable v0.1.2 // indirect
1015
github.com/opencontainers/runc v1.0.0-rc6 // indirect
16+
github.com/opentracing/opentracing-go v1.1.0 // indirect
17+
github.com/ory/dockertest v3.3.4+incompatible // indirect
18+
github.com/pkg/errors v0.8.1 // indirect
19+
github.com/sirupsen/logrus v1.4.2 // indirect
20+
github.com/stretchr/testify v1.3.0 // indirect
21+
github.com/uber-go/atomic v1.4.0 // indirect
22+
github.com/uber/jaeger-client-go v2.16.0+incompatible // indirect
23+
github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
24+
go.uber.org/atomic v1.4.0 // indirect
25+
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
26+
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
27+
golang.org/x/sys v0.0.0-20190528012530-adf421d2caf4 // indirect
28+
golang.org/x/text v0.3.2 // indirect
29+
google.golang.org/appengine v1.4.0 // indirect
30+
google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 // indirect
31+
google.golang.org/grpc v1.21.0 // indirect
32+
gopkg.in/bblfsh/sdk.v1 v1.17.0 // indirect
33+
gopkg.in/yaml.v2 v2.2.2 // indirect
1134
)

0 commit comments

Comments
 (0)