Disable upstream repositories by default

and add the --enable-upstream-repos option (-U for short) to enable them.

This allows to generate an error when a dependency is not aleardy packaged
in XCP-ng. The developer can then decide if the dependency should be either
imported or removed.

Signed-off-by: Gaëtan Lehmann <[email protected]>

Author: glehmann

Dockerfile-8.x

@@ -13,6 +13,8 @@ ARG     CENTOS_VERSION
 COPY    files/CentOS-Vault.repo.in /etc/yum.repos.d/CentOS-Vault-7.5.repo
 RUN     sed -e "s/@CENTOS_VERSION@/${CENTOS_VERSION}/g" -i /etc/yum.repos.d/CentOS-Vault-7.5.repo
 
+ENV     UPSTREAM_REPOS="C${CENTOS_VERSION}-base C${CENTOS_VERSION}-updates C${CENTOS_VERSION}-extras"
+
 # Add our repositories
 # Repository file depends on the target version of XCP-ng, and is pre-processed by build.sh
 ARG     XCP_NG_BRANCH=8.3

Dockerfile-9.x

@@ -49,8 +49,11 @@ RUN     dnf install -y \
             xcp-ng-release \
             xcp-ng-release-presets
 
-# enable repositories commonly required to build
-RUN     dnf config-manager --enable crb
+ENV     UPSTREAM_REPOS="appstream baseos crb epel extras alma10-devel"
+
+# TODO: move this before installing any packages, so we can make sure they are actually in the XCP-ng repository
+# disable upstream repositories
+RUN     echo $UPSTREAM_REPOS | xargs -n1 dnf config-manager --disable
 
 # workaround sudo not working (e.g. in podman 4.9.3 in Ubuntu 24.04)
 RUN     chmod 0400 /etc/shadow

files/Alma10-devel.repo

@@ -1,5 +1,5 @@
 [alma10-devel]
 name=Almalinux 10 devel
 baseurl=https://repo.almalinux.org/almalinux/10/devel/$basearch/os/
-enabled=1
+enabled=0
 gpgcheck=1

files/CentOS-Vault.repo.in

@@ -4,23 +4,23 @@ baseurl=http://vault.centos.org/@CENTOS_VERSION@/os/$basearch/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 exclude=ocaml*
-enabled=1
+enabled=0
 
 [C@CENTOS_VERSION@-updates]
 name=CentOS-@CENTOS_VERSION@ - Updates
 baseurl=http://vault.centos.org/@CENTOS_VERSION@/updates/$basearch/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 exclude=ocaml*
-enabled=1
+enabled=0
 
 [C@CENTOS_VERSION@-extras]
 name=CentOS-@CENTOS_VERSION@ - Extras
 baseurl=http://vault.centos.org/@CENTOS_VERSION@/extras/$basearch/
 gpgcheck=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 exclude=ocaml*
-enabled=1
+enabled=0
 
 [C@CENTOS_VERSION@-base-source]
 name=CentOS-@CENTOS_VERSION@ - Base

files/init-container.sh

@@ -49,6 +49,13 @@ if [ -n "$DISABLEREPO" ]; then
     sudo $CFGMGR --disable "$DISABLEREPO"
 fi
 
+# enable upstream repositories if needed
+if [ "$ENABLE_UPSTREAM_REPOS" == "true" ]; then
+    for repo in $UPSTREAM_REPOS; do
+        sudo $CFGMGR --enable "$repo"
+    done
+fi
+
 # enable additional repositories if needed
 if [ -n "$ENABLEREPO" ]; then
     sudo $CFGMGR --enable "$ENABLEREPO"

run.py

@@ -78,6 +78,7 @@ def main():
     parser.add_argument('--name', help='Assign a name to the container')
     parser.add_argument('--ulimit', action='append',
                         help='Ulimit options passed directly to docker run')
+    parser.add_argument('-U', '--enable-upstream-repos', action='store_true', help='enable the upstream repositories')
     parser.add_argument('-a', '--enablerepo',
                         help='additional repositories to enable before installing build dependencies. '
                              'Same syntax as yum\'s --enablerepo parameter. Available additional repositories: '
@@ -156,6 +157,8 @@ def main():
             docker_args += ["-e", env]
     if args.enablerepo:
         docker_args += ["-e", "ENABLEREPO=%s" % args.enablerepo]
+    if args.enable_upstream_repos:
+        docker_args += ["-e", "ENABLE_UPSTREAM_REPOS=true"]
     if args.disablerepo:
         docker_args += ["-e", "DISABLEREPO=%s" % args.disablerepo]
     ulimit_nofile = False