diff options
| author |  Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 16:26:16 -0700 |
| commit | 3af881c7e2db0553207876acbdb91c6e77974e44 (patch) | |
| tree | 35e2a96cce802d4235bd29afa396e28ead892fa2 /protoc-artifacts/Dockerfile | |
| parent | 86975301f1876ce1934612777b8ca6c76520f5cc (diff) | |
| parent | 942a29cecd36f2a4b22fdd2179635cd548e6bd27 (diff) | |
Merge master into 3.4.x
Diffstat (limited to 'protoc-artifacts/Dockerfile')
| -rw-r--r-- | protoc-artifacts/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/protoc-artifacts/Dockerfile b/protoc-artifacts/Dockerfile index 5143b028..36b547a2 100644 --- a/protoc-artifacts/Dockerfile +++ b/protoc-artifacts/Dockerfile @@ -30,7 +30,7 @@ RUN wget http://people.centos.org/tru/devtools-1.1/devtools-1.1.repo -P /etc/yum 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 sed -e 's/testing-/testing-i386-/g' -i /etc/yum.repos.d/devtools-i386-1.1.repo -RUN yum install -y devtoolset-1.1 \ +RUN rpm --rebuilddb && yum install -y devtoolset-1.1 \ devtoolset-1.1-libstdc++-devel \ devtoolset-1.1-libstdc++-devel.i686 |