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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tci-gateway-module
Grpc
Commits
07591a5d
Commit
07591a5d
authored
Feb 19, 2016
by
Jan Tattermusch
Browse files
Options
Downloads
Patches
Plain Diff
fix centos6.6 docker build with overlay
parent
e7b7d86f
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
tools/dockerfile/grpc_artifact_protoc/Dockerfile
+8
-13
8 additions, 13 deletions
tools/dockerfile/grpc_artifact_protoc/Dockerfile
tools/run_tests/artifact_targets.py
+1
-1
1 addition, 1 deletion
tools/run_tests/artifact_targets.py
with
9 additions
and
14 deletions
tools/dockerfile/grpc_artifact_protoc/Dockerfile
+
8
−
13
View file @
07591a5d
...
@@ -45,26 +45,21 @@ RUN yum install -y git \
...
@@ -45,26 +45,21 @@ RUN yum install -y git \
glibc-devel
\
glibc-devel
\
glibc-devel.i686
glibc-devel.i686
# Install Java 8
RUN
wget
-q
--no-cookies
--no-check-certificate
\
--header
"Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie"
"http://download.oracle.com/otn-pub/java/jdk/8u45-b14/jdk-8u45-linux-x64.tar.gz"
\
-O
- |
tar
xz
-C
/var/local
ENV
JAVA_HOME /var/local/jdk1.8.0_45
ENV
PATH $JAVA_HOME/bin:$PATH
# Install Maven
RUN
wget
-q
http://apache.cs.utah.edu/maven/maven-3/3.3.3/binaries/apache-maven-3.3.3-bin.tar.gz
-O
- |
\
tar
xz
-C
/var/local
ENV
PATH /var/local/apache-maven-3.3.3/bin:$PATH
# Install GCC 4.7 to support -static-libstdc++
# Install GCC 4.7 to support -static-libstdc++
RUN
wget http://people.centos.org/tru/devtools-1.1/devtools-1.1.repo
-P
/etc/yum.repos.d
RUN
wget http://people.centos.org/tru/devtools-1.1/devtools-1.1.repo
-P
/etc/yum.repos.d
RUN
bash
-c
'echo "enabled=1" >> /etc/yum.repos.d/devtools-1.1.repo'
RUN
bash
-c
'echo "enabled=1" >> /etc/yum.repos.d/devtools-1.1.repo'
RUN
bash
-c
"sed -e 's/
\$
basearch/i386/g' /etc/yum.repos.d/devtools-1.1.repo > /etc/yum.repos.d/devtools-i386-1.1.repo"
RUN
bash
-c
"sed -e 's/
\$
basearch/i386/g' /etc/yum.repos.d/devtools-1.1.repo > /etc/yum.repos.d/devtools-i386-1.1.repo"
RUN
sed
-e
's/testing-/testing-i386-/g'
-i
/etc/yum.repos.d/devtools-i386-1.1.repo
RUN
sed
-e
's/testing-/testing-i386-/g'
-i
/etc/yum.repos.d/devtools-i386-1.1.repo
# Make yum install twice to overcome docker issue when using overlay storage driver.
# We'll get and "Rpmdb checksum is invalid: dCDPT(pkg checksums)" error caused by
# docker issue when using overlay storage driver, but all the stuff we need
# will be installed, so for now we just ignore the error.
# https://github.com/docker/docker/issues/10180
RUN
yum
install
-y
devtoolset-1.1
\
RUN
yum
install
-y
devtoolset-1.1
\
devtoolset-1.1-libstdc++-devel
\
devtoolset-1.1-libstdc++-devel
\
devtoolset-1.1-libstdc++-devel.i686
devtoolset-1.1-libstdc++-devel.i686
||
true
# Start in devtoolset environment that uses GCC 4.7
# Start in devtoolset environment that uses GCC 4.7
CMD
["scl", "enable", "devtoolset-1.1", "bash"]
CMD
["scl", "enable", "devtoolset-1.1", "bash"]
\ No newline at end of file
This diff is collapsed.
Click to expand it.
tools/run_tests/artifact_targets.py
+
1
−
1
View file @
07591a5d
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
sign in
to comment