Skip to content

Commit

Permalink
ORC-1322: Upgrade centos7 docker image to use gcc 9
Browse files Browse the repository at this point in the history
This closes #1325
  • Loading branch information
wgtmac committed Dec 2, 2022
1 parent b5d614c commit c3d47c8
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions cmake_modules/ThirdpartyToolchain.cmake
Expand Up @@ -326,6 +326,7 @@ if (BUILD_CPP_TESTS)

set(GTEST_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX=${GTEST_PREFIX}
-DCMAKE_INSTALL_LIBDIR=lib
-Dgtest_force_shared_crt=ON
-DCMAKE_CXX_FLAGS=${GTEST_CMAKE_CXX_FLAGS})

Expand Down
8 changes: 6 additions & 2 deletions docker/centos7/Dockerfile
Expand Up @@ -28,8 +28,6 @@ RUN yum install -y \
curl-devel \
cyrus-sasl-devel \
expat-devel \
gcc \
gcc-c++ \
gettext-devel \
git \
libtool \
Expand All @@ -56,6 +54,12 @@ RUN yum install -y \
# Our scripts assume that cmake is called 'cmake'
RUN ln -s /usr/bin/cmake3 /usr/bin/cmake

# Install gcc-9
RUN yum install -y centos-release-scl
RUN yum install -y devtoolset-9
RUN echo "source /opt/rh/devtoolset-9/enable" >> /etc/bashrc
SHELL ["/bin/bash", "--login", "-c"]

ENV TZ=America/Los_Angeles
WORKDIR /root
VOLUME /root/.m2/repository
Expand Down
2 changes: 1 addition & 1 deletion docker/run-one.sh
Expand Up @@ -37,7 +37,7 @@ else

echo "Started $GITHUB_USER/$BRANCH on $BUILD at $(date)"

docker run $VOLUME "$TAG" /bin/bash -c \
docker run $VOLUME "$TAG" /bin/bash --login -c \
"$CLONE && $MAKEDIR && cmake $OPTS .. && make package test-out" \
|| failure
fi
Expand Down

0 comments on commit c3d47c8

Please sign in to comment.