Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

[develop] Modified Amazon and Centos to use yum install ccache #8405

Merged
merged 6 commits into from
Jan 7, 2020
Merged

[develop] Modified Amazon and Centos to use yum install ccache #8405

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a897781
ccache-3.7.6-1.el7.x86_64.rpm
Jan 7, 2020
c780221
ccache/epel is already enabled
Jan 7, 2020
0c07d38
ccache/epel is already enabled
Jan 7, 2020
a17ae59
amazon linux 2 epel install
Jan 7, 2020
94c12ed
added -y to install
Jan 7, 2020
95f2d19
centos -y for ccache install
Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .cicd/platforms/pinned/amazon_linux-2-pinned.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
# add mongodb to path
ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
# install ccache
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
yum install -y ccache-3.3.4-1.el7.x86_64.rpm
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
yum install -y ccache-3.7.6-1.el7.x86_64.rpm
# install nvm
RUN touch ~/.bashrc
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
Expand Down
4 changes: 2 additions & 2 deletions .cicd/platforms/pinned/centos-7.7-pinned.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
# add mongodb to path
ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
# install ccache
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
yum install -y ccache-3.3.4-1.el7.x86_64.rpm
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
yum install -y ccache-3.7.6-1.el7.x86_64.rpm
# fix ccache for centos
RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
Expand Down
4 changes: 2 additions & 2 deletions .cicd/platforms/unpinned/amazon_linux-2-unpinned.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
# add mongodb to path
ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
# install ccache
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
yum install -y ccache-3.3.4-1.el7.x86_64.rpm
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
yum install -y ccache-3.7.6-1.el7.x86_64.rpm
# install nvm
RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.0/install.sh | bash
# load nvm in non-interactive shells
Expand Down
4 changes: 2 additions & 2 deletions .cicd/platforms/unpinned/centos-7.7-unpinned.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ RUN curl -L https://github.com/mongodb/mongo-cxx-driver/archive/r3.4.0.tar.gz -o
# add mongodb to path
ENV PATH=${PATH}:/mongodb-linux-x86_64-amazon-3.6.3/bin
# install ccache
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.3.4-1.el7.x86_64.rpm && \
yum install -y ccache-3.3.4-1.el7.x86_64.rpm
RUN curl -LO http://download-ib01.fedoraproject.org/pub/epel/7/x86_64/Packages/c/ccache-3.7.6-1.el7.x86_64.rpm && \
yum install -y ccache-3.7.6-1.el7.x86_64.rpm
# fix ccache for centos
RUN cd /usr/lib64/ccache && ln -s ../../bin/ccache c++
ENV CCACHE_PATH="/opt/rh/devtoolset-8/root/usr/bin"
Expand Down