Skip to content
Permalink
Browse files

update sdk and pin openjdk version

Signed-off-by: Denys Smirnov <denys@sourced.tech>
  • Loading branch information...
dennwc committed May 28, 2019
1 parent acbb016 commit 71798fa71e4fb66b42f06831a72f28bd17005e1b
Showing with 130 additions and 21 deletions.
  1. +7 −3 Dockerfile
  2. +1 −1 README.md
  3. +3 −3 build.yml
  4. +26 −3 go.mod
  5. +93 −6 go.sum
  6. +0 −5 manifest.toml
@@ -12,7 +12,7 @@
#==============================
# Stage 1: Native Driver Build
#==============================
FROM openjdk:8-slim as native
FROM openjdk:8u181-slim as native

# install build dependencies
RUN apt update && apt install -y maven
@@ -29,14 +29,15 @@ RUN mvn package
# Stage 1.1: Native Driver Tests
#================================
FROM native as native_test

# run native driver tests
RUN mvn test


#=================================
# Stage 2: Go Driver Server Build
#=================================
FROM golang:1.10-alpine as driver
FROM golang:1.12-alpine as driver

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

ENV GO111MODULE=on GOFLAGS=-mod=vendor

# workaround for https://github.com/golang/go/issues/28065
ENV CGO_ENABLED=0

# build server binary
RUN go build -o /tmp/driver ./driver/main.go
# build tests
@@ -57,7 +61,7 @@ RUN go test -c -o /tmp/fixtures.test ./driver/fixtures/
#=======================
# Stage 3: Driver Build
#=======================
FROM openjdk:8-jre-alpine
FROM openjdk:8u181-jre-alpine



@@ -1,4 +1,4 @@
# 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)
# 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)

Development Environment
-----------------------
@@ -1,14 +1,14 @@
sdk: '2'
language: java
go-runtime:
version: '1.10-alpine'
version: '1.12-alpine'
native:
image: 'openjdk:8-jre-alpine'
image: 'openjdk:8u181-jre-alpine'
static:
- path: 'native.sh'
dest: 'native'
build:
image: 'openjdk:8-slim'
image: 'openjdk:8u181-slim'
deps:
- 'apt update && apt install -y maven'
run:
29 go.mod
@@ -4,8 +4,31 @@ go 1.12

require (
github.com/Microsoft/go-winio v0.4.12 // indirect
github.com/bblfsh/sdk/v3 v3.0.0
github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect
github.com/gogo/protobuf v1.1.1 // indirect
github.com/bblfsh/sdk/v3 v3.1.0
github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/gogo/protobuf v1.2.1 // indirect
github.com/google/go-cmp v0.3.0 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/mattn/go-colorable v0.1.2 // indirect
github.com/opencontainers/runc v1.0.0-rc6 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/ory/dockertest v3.3.4+incompatible // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/sirupsen/logrus v1.4.2 // indirect
github.com/stretchr/testify v1.3.0 // indirect
github.com/uber-go/atomic v1.4.0 // indirect
github.com/uber/jaeger-client-go v2.16.0+incompatible // indirect
github.com/uber/jaeger-lib v2.0.0+incompatible // indirect
go.uber.org/atomic v1.4.0 // indirect
golang.org/x/crypto v0.0.0-20190513172903-22d7a77e9e5f // indirect
golang.org/x/net v0.0.0-20190522155817-f3200d17e092 // indirect
golang.org/x/sys v0.0.0-20190528012530-adf421d2caf4 // indirect
golang.org/x/text v0.3.2 // indirect
google.golang.org/appengine v1.4.0 // indirect
google.golang.org/genproto v0.0.0-20190522204451-c2c4e71fbf69 // indirect
google.golang.org/grpc v1.21.0 // indirect
gopkg.in/bblfsh/sdk.v1 v1.17.0 // indirect
gopkg.in/yaml.v2 v2.2.2 // indirect
)

0 comments on commit 71798fa

Please sign in to comment.
You can’t perform that action at this time.