Skip to content

Commit 92da3bd

Browse files
stewartboogertstewartboogert
authored
Ubuntu 20/22 g4 10.7, 11.0, 11.1, 11.2 (#16)
* Ubuntu20 geant4s (11.0, 11.1, 11.2) * Ubuntu20 geant4s (11.0, 11.1, 11.2) * ubuntu 20/22 10.7, 11.0, 11.1, 11.2
1 parent 747f2df commit 92da3bd

File tree

9 files changed

+117
-15
lines changed

9 files changed

+117
-15
lines changed

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

Lines changed: 67 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ jobs:
9797
tags: ${{ steps.meta.outputs.tags }}
9898
labels: ${{ steps.meta.outputs.labels }}
9999

100-
ubuntu22-g4-10-7:
101-
needs: [ubuntu22_base]
102-
name: Push Ubuntu22 g4.10.7 docker image to Docker Hub
100+
ubuntu20-g4-11-0:
101+
needs: [ubuntu20_base]
102+
name: Push Ubuntu20 g4.11.0 docker image to Docker Hub
103103
runs-on: ubuntu-latest
104104
steps:
105105
- name: Check out the repo
@@ -115,20 +115,49 @@ jobs:
115115
id: meta
116116
uses: docker/metadata-action@v5
117117
with:
118-
images: sboogert/ubuntu22-g4.10.7
118+
images: sboogert/ubuntu20-g4.11.0
119119

120120
- name: Build and push Docker image
121121
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
122122
with:
123123
context: .
124-
file: ./dockerfiles/ubuntu22-g4.10.7
124+
file: ./dockerfiles/ubuntu20-g4.11.0
125125
push: true
126126
tags: ${{ steps.meta.outputs.tags }}
127127
labels: ${{ steps.meta.outputs.labels }}
128128

129-
ubuntu22-g4-11-4:
130-
needs: [ubuntu22_base]
131-
name: Push Ubuntu22 g4.11.4 docker image to Docker Hub
129+
ubuntu20-g4-11-1:
130+
needs: [ubuntu20_base]
131+
name: Push Ubuntu20 g4.11.1 docker image to Docker Hub
132+
runs-on: ubuntu-latest
133+
steps:
134+
- name: Check out the repo
135+
uses: actions/checkout@v4
136+
137+
- name: Log in to Docker Hub
138+
uses: docker/login-action@v3
139+
with:
140+
Username: ${{ vars.BOOGERT_DOCKER_USERNAME }}
141+
password: ${{ secrets.BOOGERT_DOCKER_PASSWORD }}
142+
143+
- name: Extract metadata (tags, labels) for Docker
144+
id: meta
145+
uses: docker/metadata-action@v5
146+
with:
147+
images: sboogert/ubuntu20-g4.11.1
148+
149+
- name: Build and push Docker image
150+
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
151+
with:
152+
context: .
153+
file: ./dockerfiles/ubuntu20-g4.11.1
154+
push: true
155+
tags: ${{ steps.meta.outputs.tags }}
156+
labels: ${{ steps.meta.outputs.labels }}
157+
158+
ubuntu20-g4-11-2:
159+
needs: [ubuntu20_base]
160+
name: Push Ubuntu20 g4.11.1 docker image to Docker Hub
132161
runs-on: ubuntu-latest
133162
steps:
134163
- name: Check out the repo
@@ -144,7 +173,36 @@ jobs:
144173
id: meta
145174
uses: docker/metadata-action@v5
146175
with:
147-
images: sboogert/ubuntu22-g4.11.4
176+
images: sboogert/ubuntu20-g4.11.2
177+
178+
- name: Build and push Docker image
179+
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
180+
with:
181+
context: .
182+
file: ./dockerfiles/ubuntu20-g4.11.2
183+
push: true
184+
tags: ${{ steps.meta.outputs.tags }}
185+
labels: ${{ steps.meta.outputs.labels }}
186+
187+
ubuntu22-g4-10-7:
188+
needs: [ubuntu22_base]
189+
name: Push Ubuntu22 g4.10.7 docker image to Docker Hub
190+
runs-on: ubuntu-latest
191+
steps:
192+
- name: Check out the repo
193+
uses: actions/checkout@v4
194+
195+
- name: Log in to Docker Hub
196+
uses: docker/login-action@v3
197+
with:
198+
Username: ${{ vars.BOOGERT_DOCKER_USERNAME }}
199+
password: ${{ secrets.BOOGERT_DOCKER_PASSWORD }}
200+
201+
- name: Extract metadata (tags, labels) for Docker
202+
id: meta
203+
uses: docker/metadata-action@v5
204+
with:
205+
images: sboogert/ubuntu22-g4.10.7
148206

149207
- name: Build and push Docker image
150208
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
@@ -213,7 +271,6 @@ jobs:
213271
tags: ${{ steps.meta.outputs.tags }}
214272
labels: ${{ steps.meta.outputs.labels }}
215273

216-
217274
ubuntu22-g4-11-2:
218275
needs: [ubuntu22_base]
219276
name: Push Ubuntu22 g4.11.2 docker image to Docker Hub

‎dockerfiles/ubuntu20-g4.10.7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
11-
cd geant4 && git checkout geant4-10.7-release && cd ../ &&\
11+
cd geant4 && git checkout geant4-10.7.4 && cd ../ &&\
1212
mkdir geant4-build && cd geant4-build &&\
1313
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 && make install && cd ../ &&\
1414
rm -rfv geant4-build geant4 &&\

‎dockerfiles/ubuntu20-g4.11.0‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM sboogert/ubuntu20-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 -j10 && 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 geant4-11.0.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 && make install && cd ../ &&\
14+
rm -rfv geant4-build geant4 &&\
15+
echo 'source /usr/local/bin/geant4.sh' >> ~/.bashrc

‎dockerfiles/ubuntu20-g4.11.1‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM sboogert/ubuntu20-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 -j10 && 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 geant4-11.1.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 && make install && cd ../ &&\
14+
rm -rfv geant4-build geant4 &&\
15+
echo 'source /usr/local/bin/geant4.sh' >> ~/.bashrc

‎dockerfiles/ubuntu20-g4.11.2‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
FROM sboogert/ubuntu20-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 -j10 && 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 geant4-11.2.0 && 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 && make install && cd ../ &&\
14+
rm -rfv geant4-build geant4 &&\
15+
echo 'source /usr/local/bin/geant4.sh' >> ~/.bashrc

‎dockerfiles/ubuntu22-g4.10.7‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
11-
cd geant4 && git checkout geant4-10.7-release && cd ../ &&\
11+
cd geant4 && git checkout geant4-10.7.4 && cd ../ &&\
1212
mkdir geant4-build && cd geant4-build &&\
1313
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 && make install && cd ../ &&\
1414
rm -rfv geant4-build geant4 &&\

‎dockerfiles/ubuntu22-g4.11.0‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
11-
cd geant4 && git checkout geant4-11.0-release && cd ../ &&\
11+
cd geant4 && git checkout geant4-11.0.3 && cd ../ &&\
1212
mkdir geant4-build && cd geant4-build &&\
1313
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 && make install && cd ../ &&\
1414
rm -rfv geant4-build geant4 &&\

‎dockerfiles/ubuntu22-g4.11.1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
11-
cd geant4 && git checkout geant4-11.1-release && cd ../ &&\
11+
cd geant4 && git checkout geant4-11.1.3 && cd ../ &&\
1212
mkdir geant4-build && cd geant4-build &&\
1313
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 && make install && cd ../ &&\
1414
rm -rfv geant4-build geant4 &&\

‎dockerfiles/ubuntu22-g4.11.2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ RUN wget https://proj-clhep.web.cern.ch/proj-clhep/dist1/clhep-2.4.4.0.tgz && \
88

99
# Geant4
1010
RUN git clone https://gitlab.cern.ch/geant4/geant4.git &&\
11-
cd geant4 && git checkout geant4-11.2-release && cd ../ &&\
11+
cd geant4 && git checkout geant4-11.2.0 && cd ../ &&\
1212
mkdir geant4-build && cd geant4-build &&\
1313
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 && make install && cd ../ &&\
1414
rm -rfv geant4-build geant4 &&\

0 commit comments

Comments
 (0)