Skip to content

Commit bb43dfa

Browse files
committed
package order
1 parent a9ea418 commit bb43dfa

File tree

4 files changed

+26
-28
lines changed

4 files changed

+26
-28
lines changed

Dockerfile-alma9

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# AlmaLinux image https://almalinux.org https://hub.docker.com/_/almalinux
22
#-----------------------------------------------------------------------------------------
33
#
4-
# docker_build_image almalinux:9 Dockerfile-alma9 base:almalinux9 "--no-cache"
4+
# docker_build_image almalinux:9.3 Dockerfile-alma9 base:almalinux9 "--no-cache"
55
# docker_run_image base:almalinux9 [i]
66
# docker_tag_and_push_image jeffersonlab/base:almalinux9
77
#
@@ -27,14 +27,13 @@ RUN dnf install -y 'dnf-command(config-manager)' \
2727
RUN dnf install -y --allowerasing \
2828
git make cmake gcc-c++ \
2929
expat-devel \
30-
mysql-devel sqlite-devel \
31-
python3-devel \
32-
python3-scons \
33-
mesa-libGLU-devel libX11-devel libXpm-devel libXft-devel libXt-devel libXmu-devel libXrender-devel xrandr \
30+
mariadb-devel sqlite-devel \
31+
python3-devel python3-scons \
32+
mesa-libGLU-devel libX11-devel libXpm-devel libXft-devel libXt-devel libXmu-devel libXrender-devel xorg-x11-server-Xvfb xrandr \
3433
bzip2 wget curl nano which bash tcsh zsh hostname gedit environment-modules \
3534
psmisc procps mailcap net-tools \
3635
perl-CPAN glibc-langpack-en \
37-
xorg-x11-server-Xvfb xterm \
36+
xterm \
3837
x11vnc novnc \
3938
# fluxbox supervisor
4039
qt5-qtbase-devel qt5-linguist \

Dockerfile-fedora36

+6-7
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,16 @@ RUN update-ca-trust
2424

2525

2626

27-
RUN yum install -y \
27+
RUN dnf install -y \
2828
git make cmake gcc-c++ \
2929
expat-devel \
30-
mysql-devel sqlite-devel \
31-
python3-devel \
32-
python3-scons \
33-
mesa-libGLU-devel libX11-devel libXpm-devel libXft-devel libXt-devel libXmu-devel libXrender-devel xrandr \
34-
bzip2 wget curl nano which bash tcsh zsh hostname gedit environment-modules \
30+
mariadb-devel sqlite-devel \
31+
python3-devel python3-scons \
32+
mesa-libGLU-devel libX11-devel libXpm-devel libXft-devel libXt-devel libXmu-devel libXrender-devel xorg-x11-server-Xvfb xrandr \
33+
bzip2 wget curl nano which bash tcsh zsh hostname gedit environment-modules \
3534
psmisc procps mailcap net-tools \
3635
perl-CPAN glibc-langpack-en \
37-
xorg-x11-server-Xvfb xterm \
36+
xterm \
3837
x11vnc novnc \
3938
fluxbox supervisor \
4039
qt5-qtbase-devel qt5-linguist \

Dockerfile-ubuntu22

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ LABEL maintainer="Maurizio Ungaro <[email protected]>"
1313
# run shell instead of sh
1414
SHELL ["/bin/bash", "-c"]
1515

16-
# Update needed to use the right package repos
16+
# Update needed at beginning to use the right package repos
1717
RUN apt update
1818

1919
# Install ca-certificates tools
@@ -29,16 +29,16 @@ RUN update-ca-certificates
2929
# no interactive session to identify the timezone
3030
RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime \
3131
&& DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends tzdata \
32-
cmake make g++ \
32+
git make cmake g++ \
3333
expat libexpat1-dev \
3434
libmysqlclient-dev libsqlite3-dev \
3535
libpython3-dev scons \
36-
libglu1-mesa-dev libx11-dev libxpm-dev libxft-dev libxt-dev libxmu-dev libxrender-dev \
37-
bzip2 wget curl nano git bash tcsh zsh hostname gedit environment-modules \
36+
libglu1-mesa-dev libx11-dev libxpm-dev libxft-dev libxt-dev libxmu-dev libxrender-dev xvfb x11-xserver-utils\
37+
bzip2 wget curl nano which bash tcsh zsh hostname gedit environment-modules \
3838
psmisc procps mailcap net-tools \
3939
libcpandb-perl \
4040
xterm \
41-
xvfb x11vnc novnc \
41+
x11vnc novnc \
4242
fluxbox supervisor \
4343
qtbase5-dev libqt5widgets5 libqt5opengl5-dev libqt5printsupport5 \
4444
&& apt update \

gemc/Dockerfile-gemc

+10-10
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
# docker_tag_and_push_sim_image 1.0 fedora36
77
#
88
# /usr/local installation, for ci
9-
# docker_build_gemc_image 4.4.2-5.4-5.5 fedora36 /usr/local
10-
# docker_tag_and_push_gemc_image 4.4.2-5.4-5.5 fedora36
11-
# docker_build_gemc_image 5.6-dev fedora36 /usr/local
12-
# docker tag gemc:5.6-dev-fedora36 jeffersonlab/gemc:dev-fedora36
13-
# docker_build_gemc_image 1.1 fedora36 /usr/local
14-
# docker_build_gemc_image 2.11 fedora36 /usr/local
15-
# docker_run_gemc_image 2.11 fedora36 [i]
16-
# docker_tag_and_push_gemc_image 2.11 fedora36
9+
# docker_build_gemc_image 4.4.2-5.4-5.5 fedora36 /usr/local
10+
# docker_tag_and_push_gemc_image 4.4.2-5.4-5.5 fedora36
11+
# docker_build_gemc_image 5.7-dev fedora36 /usr/local
12+
# docker tag gemc:5.7-dev-fedora36 jeffersonlab/gemc:dev-fedora36
13+
# docker_build_gemc_image 1.1 fedora36 /usr/local
14+
# docker_build_gemc_image 2.11 fedora36 /usr/local
15+
# docker_run_gemc_image 2.11 fedora36 [i]
16+
# docker_tag_and_push_gemc_image 2.11 fedora36
1717
#
1818
# /cvmfs installation
1919
# docker_build_sim_image 1.0 fedora36 /cvmfs/oasis.opensciencegrid.org/jlab/geant4
2020
# docker_build_sim_image 1.1 almalinux9 /cvmfs/oasis.opensciencegrid.org/jlab/geant4
21-
# docker_build_gemc_image 4.4.2-5.4-5.5 fedora36 /cvmfs/oasis.opensciencegrid.org/jlab/geant4
22-
# docker_build_gemc_image 5.6-dev fedora36 /cvmfs/oasis.opensciencegrid.org/jlab/geant4
21+
# docker_build_gemc_image 4.4.2-5.4-5.7 fedora36 /cvmfs/oasis.opensciencegrid.org/jlab/geant4
22+
# docker_build_gemc_image 5.8-dev fedora36 /cvmfs/oasis.opensciencegrid.org/jlab/geant4
2323
# docker_run_gemc_image 4.4.2-5.4-5.5 fedora36-cvmfs [i]
2424
# docker_run_gemc_image 5.6-dev fedora36-cvmfs [i]
2525
# --------------------------------------------------------------------------

0 commit comments

Comments
 (0)