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.

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

Add Qt to docker image used in github action #237

Merged
merged 1 commit into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.cern.ch/next/nexus-base:2022-07-13
FROM registry.cern.ch/next/nexus-base:2024-01-25

COPY . /nexus
WORKDIR /nexus
Expand Down
4 changes: 2 additions & 2 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ubuntu:jammy

RUN apt-get update -y && \
apt-get install -y cmake g++ libexpat1-dev libgsl27 libgsl-dev &&\
apt-get install -y cmake g++ libexpat1-dev libgsl27 libgsl-dev libqt5core5a qtbase5-dev &&\
apt-get autoremove -y && \
apt-get clean -y && \
rm -rf /var/cache/apt/archives/* && \
rm -rf /var/lib/apt/lists/*

COPY --from=registry.cern.ch/next/geant4:11.0.2 /opt/geant4 /opt/geant4
COPY --from=registry.cern.ch/next/geant4:11.0.2-qt /opt/geant4 /opt/geant4
COPY --from=registry.cern.ch/next/root:6.26.04 /opt/root/install /opt/root/install
COPY --from=registry.cern.ch/next/python-nexus:2022-07-13 /opt/conda /opt/conda
3 changes: 2 additions & 1 deletion docker/geant4/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM ubuntu:jammy
ENV G4_VERSION v11.0.2

RUN apt-get update -y && \
apt-get install -y cmake curl g++ libexpat1-dev
apt-get install -y cmake curl g++ libexpat1-dev libqt5core5a qtbase5-dev
RUN mkdir -p /opt/geant4/src && \
mkdir -p /opt/geant4/build && \
mkdir -p /opt/geant4/install && \
Expand All @@ -14,6 +14,7 @@ RUN mkdir -p /opt/geant4/src && \
cmake -DCMAKE_INSTALL_PREFIX=/opt/geant4/install \
-DGEANT4_BUILD_MULTITHREADED=ON \
-DGEANT4_INSTALL_EXAMPLES=OFF \
-DGEANT4_USE_QT=ON \
paolafer marked this conversation as resolved.
Show resolved Hide resolved
../src/geant4-${G4_VERSION} && \
make -j`nproc` && \
make install && \
Expand Down
Loading