Skip to content
Snippets Groups Projects
Commit 6a1976d5 authored by Jan Tattermusch's avatar Jan Tattermusch Committed by GitHub
Browse files

Merge pull request #9109 from jtattermusch/protoc_artifacts_fix 

Fix building protoc artifacts on linux
parents 13a16c1b 3ad65509
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/dockerfile/grpc_artifact_protoc/Dockerfile
+ 6
− 0
View file @ 6a1976d5
...@@ -59,5 +59,11 @@ RUN yum install -y devtoolset-1.1 \ ...@@ -59,5 +59,11 @@ RUN yum install -y devtoolset-1.1 \
devtoolset-1.1-libstdc++-devel \ devtoolset-1.1-libstdc++-devel \
devtoolset-1.1-libstdc++-devel.i686 || true devtoolset-1.1-libstdc++-devel.i686 || true
# Update Git to version >1.7 to allow cloning submodules with --reference arg.
RUN yum remove -y git
RUN yum install -y epel-release
RUN yum install -y https://centos6.iuscommunity.org/ius-release.rpm
RUN yum install -y git2u
# 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"]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment