Skip to content

Commit

Permalink
Add git to CentOS 6 images on x86 (i386) and x86_64
Browse files Browse the repository at this point in the history
  • Loading branch information
adamretter committed Dec 19, 2023
1 parent 338aad0 commit dad6c71
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion centos6_x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ RUN sed -i s%mirrorlist=http%#mirrorlist=http%g /etc/yum.repos.d/CentOS-Base.rep
&& yum --setopt=tsflags=nodocs -y upgrade \
&& yum --setopt=tsflags=nodocs -y install devtoolset-7 cmake3 \
&& yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel \
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel wget \
&& yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel git wget \
&& yum -y clean all \
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake 10 --slave /usr/local/bin/ctest ctest /usr/bin/ctest --slave /usr/local/bin/cpack cpack /usr/bin/cpack --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake \
&& alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 --slave /usr/local/bin/ctest ctest /usr/bin/ctest3 --slave /usr/local/bin/cpack cpack /usr/bin/cpack3 --slave /usr/local/bin/ccmake ccmake /usr/bin/ccmake3 \
Expand Down
2 changes: 1 addition & 1 deletion centos6_x86/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN curl --fail https://vault.centos.org/6.10/os/i386/Packages/udev-147-2.73.el6
&& linux32 yum --setopt=tsflags=nodocs -y reinstall udev.i686 util-linux-ng.i686 \
&& linux32 yum --setopt=tsflags=nodocs -y update \
&& linux32 yum --setopt=tsflags=nodocs -y install epel-release \
&& linux32 yum --setopt=tsflags=nodocs -y install wget tar which \
&& linux32 yum --setopt=tsflags=nodocs -y install git wget tar which \
&& linux32 yum --setopt=tsflags=nodocs -y install make perl devtoolset-8 cmake3 \
&& linux32 yum --setopt=tsflags=nodocs -y install jemalloc-devel zlib-devel bzip2-devel lz4-devel snappy-devel libzstd-devel \
&& linux32 yum --setopt=tsflags=nodocs -y install openssl java-1.8.0-openjdk-devel \
Expand Down

0 comments on commit dad6c71

Please sign in to comment.