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
e633e474
Commit
e633e474
authored
8 years ago
by
matt-kwong
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #8906 from matt-kwong/pin-bazel-version
Pin bazel version to 0.4.1 release tag
parents
8442ebee
180ea4bb
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
templates/tools/dockerfile/test/sanity/Dockerfile.template
+6
-3
6 additions, 3 deletions
templates/tools/dockerfile/test/sanity/Dockerfile.template
tools/dockerfile/test/sanity/Dockerfile
+5
-3
5 additions, 3 deletions
tools/dockerfile/test/sanity/Dockerfile
with
11 additions
and
6 deletions
templates/tools/dockerfile/test/sanity/Dockerfile.template
+
6
−
3
View file @
e633e474
...
@@ -48,9 +48,12 @@
...
@@ -48,9 +48,12 @@
#======================================
#======================================
# More sanity test dependencies (bazel)
# More sanity test dependencies (bazel)
RUN apt-get install -y openjdk-8-jdk
RUN apt-get install -y openjdk-8-jdk
# TOOD(jtattermusch): pin the bazel version
# Check out Bazel version 0.4.1 since this version allows running
RUN git clone https://github.com/bazelbuild/bazel.git /bazel
# ./compile.sh without a local protoc dependency
RUN cd /bazel && ./compile.sh
# TODO(mattkwong): install dependencies to support latest Bazel version if newer
# version is needed
RUN git clone https://github.com/bazelbuild/bazel.git /bazel && \
cd /bazel && git checkout tags/0.4.1 && ./compile.sh
RUN ln -s /bazel/output/bazel /bin/
RUN ln -s /bazel/output/bazel /bin/
#===================
#===================
...
...
This diff is collapsed.
Click to expand it.
tools/dockerfile/test/sanity/Dockerfile
+
5
−
3
View file @
e633e474
...
@@ -93,9 +93,11 @@ RUN pip install simplejson mako
...
@@ -93,9 +93,11 @@ RUN pip install simplejson mako
#======================================
#======================================
# More sanity test dependencies (bazel)
# More sanity test dependencies (bazel)
RUN
apt-get
install
-y
openjdk-8-jdk
RUN
apt-get
install
-y
openjdk-8-jdk
# TOOD(jtattermusch): pin the bazel version
# Check out Bazel version 0.4.1 since this version allows running
RUN
git clone https://github.com/bazelbuild/bazel.git /bazel
# ./compile.sh without a local protoc dependency
RUN
cd
/bazel
&&
./compile.sh
# TODO(mattkwong): install dependencies to support latest Bazel version if newer
# version is needed
RUN
git clone https://github.com/bazelbuild/bazel.git /bazel
&&
cd
/bazel
&&
git checkout tags/0.4.1
&&
./compile.sh
RUN
ln
-s
/bazel/output/bazel /bin/
RUN
ln
-s
/bazel/output/bazel /bin/
#===================
#===================
...
...
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