Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dbus #2300

Merged
merged 2 commits into from
Jun 6, 2020
Merged

Fix dbus #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d35a018
Fix dbus problem on CentOS
sgpearse Jun 4, 2020
3a10a54
Fix dbus
sgpearse Jun 4, 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
17 changes: 11 additions & 6 deletions share/docker/centos7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
# To build:
# docker image build -t centos7:1.0 .

FROM centos:centos7
FROM centos:7.4.1708
MAINTAINER The CentOS Project <[email protected]>

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 \
Expand Down Expand Up @@ -44,7 +46,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 \
Expand Down
12 changes: 1 addition & 11 deletions site_files/site.NCAR
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,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})
Expand All @@ -33,14 +34,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 ()