[WIP] Fixing CentOS Stream 8 and Ubuntu 24.04

cpp-projects-showcase · Oct 28, 2024 · 7bff0b9 · 7bff0b9
1 parent 7379c91
commit 7bff0b9
Show file tree

Hide file tree

Showing 15 changed files with 164 additions and 65 deletions.
diff --git a/centos8/Dockerfile b/centos8/Dockerfile
@@ -15,19 +15,27 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Docker build time environment variables
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Import the Centos-8 GPG key to prevent warnings
 RUN rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official && \
   rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Testing
 
-# Add the repository for PowerTools
+# As CentOS Stream 8 has been deprecated, the RPM repositories are now archived.
+# The following is a temporary work around. The long term solution is to upgrade
+# to CentOS Stream 9 (or soon to CentOS Stream 10)
+ADD resources/CentOS-Stream-AppStream.repo /etc/yum.repos.d/CentOS-Stream-AppStream.repo
+ADD resources/CentOS-Stream-BaseOS.repo /etc/yum.repos.d/CentOS-Stream-BaseOS.repo
+ADD resources/CentOS-Stream-Extras-common.repo /etc/yum.repos.d/CentOS-Stream-Extras-common.repo
+ADD resources/CentOS-Stream-Extras.repo /etc/yum.repos.d/CentOS-Stream-Extras.repo
+ADD resources/CentOS-Stream-PowerTools.repo etc/yum.repos.d/CentOS-Stream-PowerTools.repo 
+
+# Add the config manager
 RUN dnf -y install 'dnf-command(config-manager)'
-RUN dnf config-manager --set-enabled powertools
 
 # Add EPEL support
 RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
@@ -108,7 +116,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull && hash -r
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/centos8/resources/CentOS-Stream-AppStream.repo b/centos8/resources/CentOS-Stream-AppStream.repo
@@ -0,0 +1,18 @@
+# CentOS-Stream-AppStream.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[appstream]
+name=CentOS Stream $releasever - AppStream
+#mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=AppStream&infra=$infra
+baseurl=http://vault.centos.org/$contentdir/$stream/AppStream/$basearch/os/
+#baseurl=http://mirror.centos.org/$contentdir/$stream/AppStream/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/centos8/resources/CentOS-Stream-BaseOS.repo b/centos8/resources/CentOS-Stream-BaseOS.repo
@@ -0,0 +1,18 @@
+# CentOS-Stream-BaseOS.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[baseos]
+name=CentOS Stream $releasever - BaseOS
+#mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=BaseOS&infra=$infra
+baseurl=http://vault.centos.org/$contentdir/$stream/BaseOS/$basearch/os/
+#baseurl=http://mirror.centos.org/$contentdir/$stream/BaseOS/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/centos8/resources/CentOS-Stream-Extras-common.repo b/centos8/resources/CentOS-Stream-Extras-common.repo
@@ -0,0 +1,19 @@
+# CentOS-Stream-Extras-common.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[extras-common]
+name=CentOS Stream $releasever - Extras common packages
+#mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=extras-extras-common
+baseurl=http://vault.centos.org/$contentdir/$stream/extras/$basearch/extras-common/
+#baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/extras-common/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Extras
+
diff --git a/centos8/resources/CentOS-Stream-Extras.repo b/centos8/resources/CentOS-Stream-Extras.repo
@@ -0,0 +1,20 @@
+# CentOS-Stream-Extras.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[extras]
+name=CentOS Stream $releasever - Extras
+#mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=extras&infra=$infra
+baseurl=http://vault.centos.org/$contentdir/$stream/extras/$basearch/os/
+#baseurl=http://mirror.centos.org/$contentdir/$stream/extras/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
+
+
diff --git a/centos8/resources/CentOS-Stream-PowerTools.repo b/centos8/resources/CentOS-Stream-PowerTools.repo
@@ -0,0 +1,18 @@
+# CentOS-Stream-PowerTools.repo
+#
+# The mirrorlist system uses the connecting IP address of the client and the
+# update status of each mirror to pick current mirrors that are geographically
+# close to the client.  You should use this for CentOS updates unless you are
+# manually picking other mirrors.
+#
+# If the mirrorlist does not work for you, you can try the commented out
+# baseurl line instead.
+
+[powertools]
+name=CentOS Stream $releasever - PowerTools
+#mirrorlist=http://mirrorlist.centos.org/?release=$stream&arch=$basearch&repo=PowerTools&infra=$infra
+baseurl=http://vault.centos.org/$contentdir/$stream/PowerTools/$basearch/os/
+#baseurl=http://mirror.centos.org/$contentdir/$stream/PowerTools/$basearch/os/
+gpgcheck=1
+enabled=1
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
diff --git a/centos9/Dockerfile b/centos9/Dockerfile
@@ -15,11 +15,11 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Docker build time environment variables
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Import the Centos-8 GPG key to prevent warnings
 RUN rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official && \
@@ -105,7 +105,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull && hash -r
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/debian11/Dockerfile b/debian11/Dockerfile
@@ -9,12 +9,11 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Environment
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LANG4GEN en_US.utf8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Update the system
 RUN echo "Europe/Paris" > /etc/timezone
@@ -116,7 +115,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/debian12/Dockerfile b/debian12/Dockerfile
@@ -9,12 +9,11 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Environment
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LANG4GEN en_US.utf8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Update the system
 RUN echo "Europe/Paris" > /etc/timezone
@@ -116,7 +115,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/fedora39/Dockerfile b/fedora39/Dockerfile
@@ -9,8 +9,8 @@ LABEL authors="Christophe Gattardi <[email protected]>"
 LABEL version="0.1"
 
 # Docker build time environment variables
-ENV container docker
-ENV HOME /home/build
+ENV container="docker"
+ENV HOME="/home/build"
 
 # Update of Fedora and configure the locale
 RUN dnf -y upgrade && \
@@ -19,9 +19,9 @@ RUN dnf -y upgrade && \
 	localedef -f UTF-8 -i en_US en_US.UTF-8
 
 #
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Environment for the `root` user
 ADD resources/bashrc /root/.bashrc
@@ -88,7 +88,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/fedora40/Dockerfile b/fedora40/Dockerfile
@@ -9,8 +9,8 @@ LABEL authors="Christophe Gattardi <[email protected]>"
 LABEL version="0.1"
 
 # Docker build time environment variables
-ENV container docker
-ENV HOME /home/build
+ENV container="docker"
+ENV HOME="/home/build"
 
 # Update of Fedora and configure the locale
 RUN dnf -y upgrade && \
@@ -19,9 +19,9 @@ RUN dnf -y upgrade && \
 	localedef -f UTF-8 -i en_US en_US.UTF-8
 
 #
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Environment for the `root` user
 ADD resources/bashrc /root/.bashrc
@@ -88,7 +88,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/rocky9/Dockerfile b/rocky9/Dockerfile
@@ -17,11 +17,11 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Docker build time environment variables
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Add the repository for CodeReady Linux Builder (CRB)
 RUN dnf -y install 'dnf-command(config-manager)'
@@ -103,7 +103,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull && hash -r
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/ubuntu2004/Dockerfile b/ubuntu2004/Dockerfile
@@ -9,11 +9,11 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Environment
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Update the system
 RUN echo "Europe/Paris" > /etc/timezone
@@ -115,7 +115,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \

diff --git a/ubuntu2204/Dockerfile b/ubuntu2204/Dockerfile
@@ -9,11 +9,11 @@ LABEL authors="Denis Arnaud <denis.arnaud_github at m4x dot org>"
 LABEL version="0.1"
 
 # Environment
-ENV container docker
-ENV HOME /home/build
-ENV LANGUAGE en_US:en
-ENV LANG en_US.UTF-8
-ENV LC_ALL $LANG
+ENV container="docker"
+ENV HOME="/home/build"
+ENV LANGUAGE="en_US:en"
+ENV LANG="en_US.UTF-8"
+ENV LC_ALL="$LANG"
 
 # Update the system
 RUN echo "Europe/Paris" > /etc/timezone
@@ -115,7 +115,7 @@ WORKDIR $HOME/.pyenv
 RUN git pull
 WORKDIR $HOME
 
-ENV PATH $HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH
+ENV PATH="$HOME/.pyenv/bin:$HOME/.pyenv/shims:$PATH"
 # Python 3.8.20
 RUN pyenv install 3.8.20 && \
     pyenv global 3.8.20 && \