Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
P
protobuf
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
protobuf
Commits
0f8c25d1
Commit
0f8c25d1
authored
Feb 19, 2016
by
Josh Haberman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly add JDK deps in the Docker image.
parent
738393b2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
5 deletions
+19
-5
Dockerfile
tools/docker/Dockerfile
+10
-2
jenkins.sh
tools/run_tests/jenkins.sh
+1
-1
tests.sh
tools/run_tests/tests.sh
+8
-2
No files found.
tools/docker/Dockerfile
View file @
0f8c25d1
...
...
@@ -30,7 +30,8 @@
# Base Dockerfile for gRPC dev images
FROM
debian:latest
# Install Git.
# Install dependencies. We start with the basic ones require to build protoc
# and the C++ build
RUN
apt-get update
&&
apt-get
install
-y
\
autoconf
\
autotools-dev
\
...
...
@@ -52,7 +53,14 @@ RUN apt-get update && apt-get install -y \
telnet
\
unzip
\
wget
\
zip
&&
apt-get clean
zip
\
# For all Java builds
\
maven
\
# For java_jdk6
\
# oops! not in Jessie. Too old? openjdk-6-jdk
\
# For java_jdk7
\
openjdk-7-jdk
\
&&
apt-get clean
# Prepare ccache
RUN
ln
-s
/usr/bin/ccache /usr/local/bin/gcc
...
...
tools/run_tests/jenkins.sh
View file @
0f8c25d1
...
...
@@ -19,5 +19,5 @@ cd protobuf
$TEST_SCRIPT
cpp
||
exit
1
# Other tests can fail and we keep on going.
$TEST_SCRIPT
java_jdk6
#
$TEST_SCRIPT java_jdk6
$TEST_SCRIPT
java_jdk7
tools/run_tests/tests.sh
View file @
0f8c25d1
#!/bin/bash
on_travis
()
{
if
[
"
$TRAVIS
"
==
"true"
]
;
then
"
$@
"
fi
}
# For when some other test needs the C++ main build, including protoc and
# libprotobuf.
internal_build_cpp
()
{
...
...
@@ -75,11 +81,11 @@ use_java() {
version
=
$1
case
"
$version
"
in
jdk6
)
sudo
apt-get
install
openjdk-6-jdk
on_travis
sudo
apt-get
install
openjdk-6-jdk
export
PATH
=
/usr/lib/jvm/java-6-openjdk-amd64/bin:
$PATH
;;
jdk7
)
sudo
apt-get
install
openjdk-7-jdk
on_travis
sudo
apt-get
install
openjdk-7-jdk
export
PATH
=
/usr/lib/jvm/java-7-openjdk-amd64/bin:
$PATH
;;
oracle7
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment