From d35a01855fb8d5fe0596c254e0036213d00b2219 Mon Sep 17 00:00:00 2001 From: Scott Pearse Date: Thu, 4 Jun 2020 08:49:34 -0600 Subject: [PATCH 1/2] Fix dbus problem on CentOS --- share/docker/centos7/Dockerfile | 19 +++++++++++++------ site_files/site.NCAR | 13 ++----------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/share/docker/centos7/Dockerfile b/share/docker/centos7/Dockerfile index 48f66fcbc..8fd887abb 100644 --- a/share/docker/centos7/Dockerfile +++ b/share/docker/centos7/Dockerfile @@ -1,17 +1,21 @@ # To build: # docker image build -t centos7:1.0 . -FROM centos:centos7 +#FROM centos:centos7 + +FROM centos:7.4.1708 MAINTAINER The CentOS Project CMD [ "/bin/bash" ] - -RUN yum -y clean all \ - && yum -y clean metadata \ - && yum -y update +# Do not update yum! updating system libraries renders Vapor incompatible on older +# CentOS versions, such as those run on Casper and Hera +#RUN yum -y clean all \ +# && yum -y clean metadata \ +# && yum -y update RUN yum -y install epel-release \ + && yum -y install dbus \ && yum -y install cmake3 \ && yum -y install make \ && yum -y install bsdtar \ @@ -44,7 +48,10 @@ RUN alternatives --install /usr/local/bin/cmake cmake /usr/bin/cmake3 20 \ RUN mkdir -p /usr/local/VAPOR-Deps -#Hack to download a file from google drive +# Qt 5.12.4 +#RUN fileid="1q9U5FJIvWLvwNbKLVluCiSH-uAnQVgU1" \ + +# Qt 5.13.2 RUN fileid="1e7F3kDoKctBmB3NOF4dES2395oScb9_0" \ && filename="/usr/local/VAPOR-Deps/2019-Aug-CentOS.tar.xz" \ && curl -c ./cookie -s -L "https://drive.google.com/uc?export=download&id=${fileid}" > /dev/null \ diff --git a/site_files/site.NCAR b/site_files/site.NCAR index 14385a83b..37c4b25a8 100644 --- a/site_files/site.NCAR +++ b/site_files/site.NCAR @@ -6,6 +6,7 @@ if (APPLE) elseif (UNIX AND NOT APPLE) set (THIRD_PARTY_DIR /usr/local/VAPOR-Deps/2019-Aug ) set (QTDIR /usr/local/VAPOR-Deps/2019-Aug/Qt/5.13.2/gcc_64) + #set (QTDIR /usr/local/VAPOR-Deps/2019-Aug/Qt/5.12.4/gcc_64) set (CMAKE_PREFIX_PATH ${QTDIR}/lib/cmake ) set (Qt5Core_DIR ${QTDIR}/lib/cmake/Qt5Core ) set (QT_QMAKE_EXECUTABLE ${QTDIR}/gcc_64/bin/qmake ) @@ -21,6 +22,7 @@ if (UNIX) set (PYTHONVERSION 3.6) set (PYTHONDIR ${THIRD_PARTY_DIR}) set (PYTHONPATH ${THIRD_PARTY_LIB_DIR}/python${PYTHONVERSION}) + set (EXTRA_LIBS_SEARCH ${EXTRA_LIBS_SEARCH} dbus) elseif (WIN32) set (PYTHONVERSION 36) set (PYTHONPATH ${THIRD_PARTY_DIR}/Python${PYTHONVERSION}) @@ -33,14 +35,3 @@ if (WIN32) else () set (NUMPY_INCLUDE_DIR "${PYTHONPATH}/site-packages/numpy/core/include") endif () - - -cmake_host_system_information(RESULT HOSTNAME QUERY HOSTNAME) -if (HOSTNAME MATCHES "cisl-garibaldi") - if (BUILD_GUI) - set (EXTRA_LIBS_SEARCH ${EXTRA_LIBS_SEARCH} dbus) - endif () -endif () - - - From 3a10a5440f5700c3765bc8a06f9ab36868367d35 Mon Sep 17 00:00:00 2001 From: Scott Pearse Date: Thu, 4 Jun 2020 09:03:58 -0600 Subject: [PATCH 2/2] Fix dbus --- share/docker/centos7/Dockerfile | 2 -- site_files/site.NCAR | 1 - 2 files changed, 3 deletions(-) diff --git a/share/docker/centos7/Dockerfile b/share/docker/centos7/Dockerfile index 8fd887abb..f87d34c80 100644 --- a/share/docker/centos7/Dockerfile +++ b/share/docker/centos7/Dockerfile @@ -1,8 +1,6 @@ # To build: # docker image build -t centos7:1.0 . -#FROM centos:centos7 - FROM centos:7.4.1708 MAINTAINER The CentOS Project diff --git a/site_files/site.NCAR b/site_files/site.NCAR index 37c4b25a8..7f1c83c2c 100644 --- a/site_files/site.NCAR +++ b/site_files/site.NCAR @@ -6,7 +6,6 @@ if (APPLE) elseif (UNIX AND NOT APPLE) set (THIRD_PARTY_DIR /usr/local/VAPOR-Deps/2019-Aug ) set (QTDIR /usr/local/VAPOR-Deps/2019-Aug/Qt/5.13.2/gcc_64) - #set (QTDIR /usr/local/VAPOR-Deps/2019-Aug/Qt/5.12.4/gcc_64) set (CMAKE_PREFIX_PATH ${QTDIR}/lib/cmake ) set (Qt5Core_DIR ${QTDIR}/lib/cmake/Qt5Core ) set (QT_QMAKE_EXECUTABLE ${QTDIR}/gcc_64/bin/qmake )