mirror of
https://ops.gitlab.net/gitlab-org/gitlab-build-images.git
synced 2025-12-11 02:52:56 +01:00
Add new optional gcc 6.3 in CentOS 6
This commit is contained in:
parent
facfabfab6
commit
ed408951c5
1 changed files with 9 additions and 1 deletions
|
|
@ -3,7 +3,7 @@ FROM centos:centos6
|
||||||
RUN yum update -y -q \
|
RUN yum update -y -q \
|
||||||
&& yum groupinstall -y Development Tools \
|
&& yum groupinstall -y Development Tools \
|
||||||
&& yum install -y \
|
&& yum install -y \
|
||||||
gcc gcc-c++ git make curl zlib-devel openssl-devel \
|
devtoolset-6-gcc devtoolset-6-gcc-c++ git make curl zlib-devel openssl-devel \
|
||||||
&& yum clean all
|
&& yum clean all
|
||||||
|
|
||||||
ENV LANG en_US.UTF-8
|
ENV LANG en_US.UTF-8
|
||||||
|
|
@ -20,3 +20,11 @@ RUN curl -fsSL "https://cache.ruby-lang.org/pub/ruby/2.4/ruby-${RUBY_VERSION}.ta
|
||||||
&& cd / \
|
&& cd / \
|
||||||
&& rm -rf "/tmp/ruby-${RUBY_VERSION}" \
|
&& rm -rf "/tmp/ruby-${RUBY_VERSION}" \
|
||||||
&& gem install bundler --no-document
|
&& gem install bundler --no-document
|
||||||
|
|
||||||
|
# Make new GCC available inside the container by default
|
||||||
|
RUN echo $'\
|
||||||
|
export CC=/opt/rh/devtoolset-6/root/usr/bin/gcc \n\
|
||||||
|
export CPP=/opt/rh/devtoolset-6/root/usr/bin/cpp \n\
|
||||||
|
export CXX=/opt/rh/devtoolset-6/root/usr/bin/c++ \n\
|
||||||
|
' > /etc/profile.d/devtools.sh
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue