Skip to content

Commit ea1f35f

Browse files
move patch to correct location
1 parent 973befd commit ea1f35f

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

dockerfiles/ubuntu20-base

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
FROM ubuntu:focal
22

3-
ADD .github/patches/ubuntu20-g4.11.0-Geant4PackageCache.cmake-patch /tmp/
4-
53
RUN mkdir -p /run/systemd && echo 'docker' > /run/systemd/container
64

75
SHELL ["/bin/bash", "-c"]
86
ENTRYPOINT ["/bin/bash"]
97

108
WORKDIR /tmp
119

12-
RUN ls -l /tmp
13-
1410
# start with more uptodate packages
1511
RUN apt-get update
1612

dockerfiles/ubuntu20-g4.11.0

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
FROM bdsim/ubuntu20-base
22

3+
ADD .github/patches/ubuntu20-g4.11.0-Geant4PackageCache.cmake-patch /tmp/
4+
35
# CLHEP
46
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.5.1.tgz && \
57
tar -xf clhep-2.4.5.1.tgz && rm -rf clhep-2.4.5.1.tgz && \
@@ -16,4 +18,4 @@ RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
1618
echo 'source /usr/local/bin/geant4.sh' >> ~/.bashrc
1719

1820
# Apply expat patch to geant4 install
19-
RUN patch -p0 < .github/patches/ubuntu20-g4.11.0-Geant4PackageCache.cmake-patch
21+
RUN patch -p0 < /tmp/ubuntu20-g4.11.0-Geant4PackageCache.cmake-patch

0 commit comments

Comments
 (0)