Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Grpc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
c0944ddd
Commit
c0944ddd
authored
9 years ago
by
Eric Anderson
Browse files
Options
Downloads
Patches
Plain Diff
For Docker grpc_java, no longer build Netty
In grpc/grpc-java#425 we will be removing the netty submodule.
parent
977565c2
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/dockerfile/grpc_java/Dockerfile
+2
-4
2 additions, 4 deletions
tools/dockerfile/grpc_java/Dockerfile
tools/dockerfile/grpc_java_base/Dockerfile
+4
-13
4 additions, 13 deletions
tools/dockerfile/grpc_java_base/Dockerfile
with
6 additions
and
17 deletions
tools/dockerfile/grpc_java/Dockerfile
+
2
−
4
View file @
c0944ddd
...
@@ -30,10 +30,8 @@
...
@@ -30,10 +30,8 @@
# Dockerfile for the gRPC Java dev image
# Dockerfile for the gRPC Java dev image
FROM
grpc/java_base
FROM
grpc/java_base
RUN
git clone
--recursive
--depth
1 https://github.com/grpc/grpc-java.git /var/local/git/grpc-java
RUN
git clone
--recursive
--depth
1 https://github.com/grpc/grpc-java.git /var/local/git/grpc-java
&&
\
RUN
cd
/var/local/git/grpc-java/lib/netty
&&
\
cd
/var/local/git/grpc-java
&&
\
mvn
-pl
codec-http2
-am
-DskipTests
install
clean
RUN
cd
/var/local/git/grpc-java
&&
\
./gradlew :grpc-interop-testing:installDist
-PskipCodegen
=
true
./gradlew :grpc-interop-testing:installDist
-PskipCodegen
=
true
# Add a service_account directory containing the auth creds file
# Add a service_account directory containing the auth creds file
...
...
This diff is collapsed.
Click to expand it.
tools/dockerfile/grpc_java_base/Dockerfile
+
4
−
13
View file @
c0944ddd
...
@@ -44,20 +44,11 @@ RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true
...
@@ -44,20 +44,11 @@ RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true
&&
\
&&
\
apt-get clean
&&
rm
-r
/var/cache/oracle-jdk8-installer/
apt-get clean
&&
rm
-r
/var/cache/oracle-jdk8-installer/
# Install maven
RUN
wget
-O
- http://mirror.olnevhost.net/pub/apache/maven/binaries/apache-maven-3.2.1-bin.tar.gz |
\
tar
xz
-C
/var/local
ENV
JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV
JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV
M2_HOME /var/local/apache-maven-3.2.1
ENV
PATH $PATH:$JAVA_HOME/bin
ENV
PATH $PATH:$JAVA_HOME/bin:$M2_HOME/bin
ENV
LD_LIBRARY_PATH /usr/local/lib
# Trigger download of as many Maven and Gradle artifacts as possible. We don't build grpc-java
# Trigger download of as many Gradle artifacts as possible.
# because we don't want to install netty
RUN
git clone
--recursive
--depth
1 https://github.com/grpc/grpc-java.git
&&
\
RUN
git clone
--recursive
--depth
1 https://github.com/grpc/grpc-java.git
&&
\
cd
grpc-java/lib/netty
&&
\
cd
grpc-java
&&
\
mvn
-pl
codec-http2
-am
-DskipTests
verify
&&
\
./gradlew build
-PskipCodegen
=
true
&&
\
cd
../..
&&
\
./gradlew
&&
\
rm
-r
"
$(
pwd
)
"
rm
-r
"
$(
pwd
)
"
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment