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
9d4e4ffb
Commit
9d4e4ffb
authored
8 years ago
by
Sree Kuchibhotla
Browse files
Options
Downloads
Patches
Plain Diff
Fix back slashes in the template and break the RUN steps
parent
5bc112c0
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/java_deps.include
+11
-11
11 additions, 11 deletions
templates/tools/dockerfile/java_deps.include
tools/dockerfile/stress_test/grpc_interop_stress_java/Dockerfile
+11
-1
11 additions, 1 deletion
...ockerfile/stress_test/grpc_interop_stress_java/Dockerfile
with
22 additions
and
12 deletions
templates/tools/dockerfile/java_deps.include
+
11
−
11
View file @
9d4e4ffb
# Install JDK 8 and Git
# Install JDK 8 and Git
#
#
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections &&
\
RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | /usr/bin/debconf-set-selections &&
${'\\'}
echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list &&
\
echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list &&
${'\\'}
echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list &&
\
echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list &&
${'\\'}
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
&& \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
apt-get update && \
apt-get -y install
\
RUN apt-get update &&
apt-get -y install
${'\\'}
git
\
git
${'\\'}
libapr1
\
libapr1
${'\\'}
oracle-java8-installer
\
oracle-java8-installer
${'\\'}
&&
\
&&
${'\\'}
apt-get clean && rm -r /var/cache/oracle-jdk8-installer/
apt-get clean && rm -r /var/cache/oracle-jdk8-installer/
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV PATH $PATH:$JAVA_HOME/bin
ENV PATH $PATH:$JAVA_HOME/bin
...
...
This diff is collapsed.
Click to expand it.
tools/dockerfile/stress_test/grpc_interop_stress_java/Dockerfile
+
11
−
1
View file @
9d4e4ffb
...
@@ -82,7 +82,17 @@ RUN pip install --upgrade google-api-python-client
...
@@ -82,7 +82,17 @@ RUN pip install --upgrade google-api-python-client
# Install JDK 8 and Git
# Install JDK 8 and Git
#
#
RUN
echo
oracle-java8-installer shared/accepted-oracle-license-v1-1
select
true
| /usr/bin/debconf-set-selections
&&
echo
"deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
|
tee
/etc/apt/sources.list.d/webupd8team-java.list
&&
echo
"deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
|
tee
-a
/etc/apt/sources.list.d/webupd8team-java.list
&&
apt-key adv
--keyserver
hkp://keyserver.ubuntu.com:80
--recv-keys
EEA14886
&&
apt-get update
&&
apt-get
-y
install
git libapr1 oracle-java8-installer
&&
apt-get clean
&&
rm
-r
/var/cache/oracle-jdk8-installer/
RUN
echo
oracle-java8-installer shared/accepted-oracle-license-v1-1
select
true
| /usr/bin/debconf-set-selections
&&
\
echo
"deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
|
tee
/etc/apt/sources.list.d/webupd8team-java.list
&&
\
echo
"deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main"
|
tee
-a
/etc/apt/sources.list.d/webupd8team-java.list
&&
\
apt-key adv
--keyserver
hkp://keyserver.ubuntu.com:80
--recv-keys
EEA14886
RUN
apt-get update
&&
apt-get
-y
install
\
git
\
libapr1
\
oracle-java8-installer
\
&&
\
apt-get clean
&&
rm
-r
/var/cache/oracle-jdk8-installer/
ENV
JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV
JAVA_HOME /usr/lib/jvm/java-8-oracle
ENV
PATH $PATH:$JAVA_HOME/bin
ENV
PATH $PATH:$JAVA_HOME/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