Skip to content

Commit 29eae13

Browse files
stewartboogertstewartboogert
authored
Centos7 toolset and all G4 versions (#31)
* Add missing geant4 versions and nproc * Correct toolset for Centos7
1 parent 2b25030 commit 29eae13

File tree

10 files changed

+101
-11
lines changed

10 files changed

+101
-11
lines changed

‎.github/workflows/docker-image.yml‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -628,6 +628,35 @@ jobs:
628628
tags: ${{ steps.meta.outputs.tags }}
629629
labels: ${{ steps.meta.outputs.labels }}
630630

631+
alma9-g4-10-4:
632+
needs: [alma9_base]
633+
name: Push Alma9 g4.10.4 docker image to Docker Hub
634+
runs-on: ubuntu-latest
635+
steps:
636+
- name: Check out the repo
637+
uses: actions/checkout@v4
638+
639+
- name: Log in to Docker Hub
640+
uses: docker/login-action@v3
641+
with:
642+
Username: ${{ vars.BOOGERT_DOCKER_USERNAME }}
643+
password: ${{ secrets.BOOGERT_DOCKER_PASSWORD }}
644+
645+
- name: Extract metadata (tags, labels) for Docker
646+
id: meta
647+
uses: docker/metadata-action@v5
648+
with:
649+
images: sboogert/alma9-g4.10.4
650+
651+
- name: Build and push Docker image
652+
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
653+
with:
654+
context: .
655+
file: ./dockerfiles/alma9-g4.10.4
656+
push: true
657+
tags: ${{ steps.meta.outputs.tags }}
658+
labels: ${{ steps.meta.outputs.labels }}
659+
631660
alma9-g4-10-7:
632661
needs: [alma9_base]
633662
name: Push Alma9 g4.10.7 docker image to Docker Hub
@@ -657,6 +686,35 @@ jobs:
657686
tags: ${{ steps.meta.outputs.tags }}
658687
labels: ${{ steps.meta.outputs.labels }}
659688

689+
alma9-g4-10-7jai:
690+
needs: [alma9_base]
691+
name: Push Alma9 g4.10.7jai docker image to Docker Hub
692+
runs-on: ubuntu-latest
693+
steps:
694+
- name: Check out the repo
695+
uses: actions/checkout@v4
696+
697+
- name: Log in to Docker Hub
698+
uses: docker/login-action@v3
699+
with:
700+
Username: ${{ vars.BOOGERT_DOCKER_USERNAME }}
701+
password: ${{ secrets.BOOGERT_DOCKER_PASSWORD }}
702+
703+
- name: Extract metadata (tags, labels) for Docker
704+
id: meta
705+
uses: docker/metadata-action@v5
706+
with:
707+
images: sboogert/alma9-g4.10.7jai
708+
709+
- name: Build and push Docker image
710+
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
711+
with:
712+
context: .
713+
file: ./dockerfiles/alma9-g4.10.7jai
714+
push: true
715+
tags: ${{ steps.meta.outputs.tags }}
716+
labels: ${{ steps.meta.outputs.labels }}
717+
660718
alma9-g4-11-0:
661719
needs: [alma9_base]
662720
name: Push Alma9 g4.11.0 docker image to Docker Hub

‎dockerfiles/alma9-g4.10.4‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM sboogert/alma9-base
2+
3+
# CLHEP
4+
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
5+
tar -xf clhep-2.4.4.0.tgz && rm -rf clhep-2.4.4.0.tgz && \
6+
mkdir clhep-build && cd clhep-build && cmake ../2.4.4.0/CLHEP/ && \
7+
make -j`$(nproc --all)` && make install && cd ../ && rm -rfv 2.4.4.0 clhep-build
8+
9+
# Geant4
10+
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
11+
cd geant4 && git checkout v10.4.3 && cd ../ &&\
12+
mkdir geant4-build && cd geant4-build &&\
13+
cmake ../geant4 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_SYSTEM_CLHEP=ON -DGEANT4_USE_RAYTRACER_X11=ON && make -j6 &&\
14+
make -j4 install && cd ../ &&\
15+
rm -rfv geant4-build geant4 &&\
16+
echo 'source /usr/local/bin/geant4.sh' >> ~/.bashrc

‎dockerfiles/alma9-g4.10.7jai‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM sboogert/alma9-base
2+
3+
# CLHEP
4+
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
5+
tar -xf clhep-2.4.4.0.tgz && rm -rf clhep-2.4.4.0.tgz && \
6+
mkdir clhep-build && cd clhep-build && cmake ../2.4.4.0/CLHEP/ && \
7+
make -j`$(nproc --all)` && make install && cd ../ && rm -rfv 2.4.4.0 clhep-build
8+
9+
# Geant4
10+
RUN git clone https://[email protected]/sboogert/geant4.git &&\
11+
cd geant4 && git checkout v10.7.2.3 && cd ../ &&\
12+
mkdir geant4-build && cd geant4-build &&\
13+
cmake ../geant4 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_SYSTEM_CLHEP=ON -DGEANT4_USE_RAYTRACER_X11=ON && make -j6 &&\
14+
make install && cd ../ &&\
15+
rm -rfv geant4-build geant4 &&\
16+
echo 'source /usr/local/bin/geant4.sh' >> ~/.bashrc

‎dockerfiles/alma9-g4.11.0‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM sboogert/alma9-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.5.1.tgz && \
55
tar -xf clhep-2.4.5.1.tgz && rm -rf clhep-2.4.5.1.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.5.1/CLHEP/ && \
7-
make -j4 && make install && cd ../ && rm -rfv 2.4.5.1 clhep-build
7+
make -j`$(nproc --all)` && make install && cd ../ && rm -rfv 2.4.5.1 clhep-build
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\

‎dockerfiles/alma9-g4.11.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM sboogert/alma9-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.6.2.tgz && \
55
tar -xf clhep-2.4.6.2.tgz && rm -rf clhep-2.4.6.2.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.6.2/CLHEP/ && \
7-
make -j4 && make install && cd ../ && rm -rfv 2.4.6.2 clhep-build
7+
make -j`$(nproc --all)` && make install && cd ../ && rm -rfv 2.4.6.2 clhep-build
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\

‎dockerfiles/alma9-g4.11.2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ FROM sboogert/alma9-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.7.1.tgz && \
55
tar -xf clhep-2.4.7.1.tgz && rm -rf clhep-2.4.7.1.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.7.1/CLHEP/ && \
7-
make -j4 && make install && cd ../ && rm -rfv 2.4.7.1 clhep-build
7+
make -j`$(nproc --all)` && make install && cd ../ && rm -rfv 2.4.7.1 clhep-build
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\

‎dockerfiles/centos7-g4.10.7‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ FROM sboogert/centos7-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
55
tar -xf clhep-2.4.4.0.tgz && rm -rf clhep-2.4.4.0.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.4.0/CLHEP/ && \
7-
source scl_source enable devtoolset-7 &&\
7+
source scl_source enable devtoolset-9 &&\
88
make -j4 && make install && cd ../ && rm -rfv 2.4.4.0 clhep-build
99

1010
# Geant4
1111
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
1212
cd geant4 && git checkout v10.7.4 && cd ../ &&\
1313
mkdir geant4-build && cd geant4-build &&\
14-
source scl_source enable devtoolset-7 &&\
14+
source scl_source enable devtoolset-9 &&\
1515
cmake ../geant4 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_SYSTEM_CLHEP=ON -DGEANT4_USE_RAYTRACER_X11=ON &&\
1616
make -j4 && make install && cd ../ &&\
1717
rm -rfv geant4-build geant4 &&\

‎dockerfiles/centos7-g4.11.0‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ FROM sboogert/centos7-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.5.1.tgz && \
55
tar -xf clhep-2.4.5.1.tgz && rm -rf clhep-2.4.5.1.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.5.1/CLHEP/ && \
7-
source scl_source enable devtoolset-7 &&\
7+
source scl_source enable devtoolset-9 &&\
88
make -j4 && make install && cd ../ && rm -rfv 2.4.5.1 clhep-build
99

1010
# Geant4
1111
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
1212
cd geant4 && git checkout v11.0.3 && cd ../ &&\
1313
mkdir geant4-build && cd geant4-build &&\
14-
source scl_source enable devtoolset-7 &&\
14+
source scl_source enable devtoolset-9 &&\
1515
cmake ../geant4 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_SYSTEM_CLHEP=ON -DGEANT4_USE_RAYTRACER_X11=ON &&\
1616
make -j4 && make install && cd ../ &&\
1717
rm -rfv geant4-build geant4 &&\

‎dockerfiles/centos7-g4.11.1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ FROM sboogert/centos7-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.6.2.tgz && \
55
tar -xf clhep-2.4.6.2.tgz && rm -rf clhep-2.4.6.2.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.6.2/CLHEP/ && \
7-
source scl_source enable devtoolset-7 &&\
7+
source scl_source enable devtoolset-9 &&\
88
make -j4 && make install && cd ../ && rm -rfv 2.4.6.2 clhep-build
99

1010
# Geant4
1111
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
1212
cd geant4 && git checkout v11.1.3 && cd ../ &&\
1313
mkdir geant4-build && cd geant4-build &&\
14-
source scl_source enable devtoolset-7 &&\
14+
source scl_source enable devtoolset-9 &&\
1515
cmake ../geant4 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_SYSTEM_CLHEP=ON -DGEANT4_USE_RAYTRACER_X11=ON &&\
1616
make -j4 && make install && cd ../ &&\
1717
rm -rfv geant4-build geant4 &&\

‎dockerfiles/centos7-g4.11.2‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ FROM sboogert/centos7-base
44
RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.7.1.tgz && \
55
tar -xf clhep-2.4.7.1.tgz && rm -rf clhep-2.4.7.1.tgz && \
66
mkdir clhep-build && cd clhep-build && cmake ../2.4.7.1/CLHEP/ && \
7-
source scl_source enable devtoolset-7 &&\
7+
source scl_source enable devtoolset-9 &&\
88
make -j4 && make install && cd ../ && rm -rfv 2.4.7.1 clhep-build
99

1010
# Geant4
1111
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
1212
cd geant4 && git checkout v11.2.0 && cd ../ &&\
1313
mkdir geant4-build && cd geant4-build &&\
14-
source scl_source enable devtoolset-7 &&\
14+
source scl_source enable devtoolset-9 &&\
1515
cmake ../geant4 -DGEANT4_INSTALL_DATA=ON -DGEANT4_USE_GDML=ON -DGEANT4_USE_OPENGL_X11=ON -DGEANT4_USE_SYSTEM_CLHEP=ON -DGEANT4_USE_RAYTRACER_X11=ON &&\
1616
make -j4 && make install && cd ../ &&\
1717
rm -rfv geant4-build geant4 &&\

0 commit comments

Comments
 (0)