Skip to content

Allow for user provied repo config #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
smehta99 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Allow for user provied repo config #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
405ecfa
Allow for user provied repo config
smehta99 Jan 30, 2026
1bf1cd2
zypper changes
smehta99 Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,25 @@ options:
# Package repositories to add. This example uses YUM/DNF repositories.
repos:
- alias: 'rocky-baseos'
url: 'http://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os'
- alias: 'rock_appstream'
url: 'http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os'
- alias: 'rock_powertools'
url: 'http://dl.rockylinux.org/pub/rocky/8/PowerTools/x86_64/os'
content: |
name=rocky-baseos
baseurl='http://dl.rockylinux.org/pub/rocky/8/BaseOS/x86_64/os'
enabled=1
- alias: 'rocky-appstream'
content: |
name=rocky-appstream
baseurl='http://dl.rockylinux.org/pub/rocky/8/AppStream/x86_64/os'
enabled=1
- alias: 'rocky-powertools'
content: |
name=rocky-appstream
baseurl='http://dl.rockylinux.org/pub/rocky/8/PowerTools/x86_64/os'
enabled=1
- alias: 'epel'
url: 'http://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/'
content: |
name=epel
baseurl='http://dl.fedoraproject.org/pub/epel/8/Everything/x86_64/'
enabled=1

# Package groups to install, in this example YUM/DNF package groups.
package_groups:
Expand Down
8 changes: 3 additions & 5 deletions dockerfiles/zypper/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ RUN zypper -n --no-gpg-checks install \
tar \
squashfs \
libcap-progs \
cni \
cni-plugins \
rsync \
unzip

Expand All @@ -59,14 +57,14 @@ COPY requirements.txt /tmp/requirements.txt

# install ansible-bender
#RUN pip3.11 --proxy=http://192.12.184.19:8080 install ansible==4.10.0 ansible-base==2.10.17 ansible-bender boto3 dnspython requests jinja2_ansible_filters
RUN pip3.11 --proxy=http://192.12.184.19:8080 install -r /tmp/requirements.txt && \
RUN pip3.11 install -r /tmp/requirements.txt && \
rm -f /tmp/requirements.txt

RUN echo "%_netsharedpath /dev" >> /etc/rpm/macros

# allow fuse mount
COPY containers/storage.conf /etc/containers/storage.conf
RUN chmod 0644 /etc/containers/storage.conf
#COPY containers/storage.conf /etc/containers/storage.conf
#RUN chmod 0644 /etc/containers/storage.conf

# Allow non-root to run buildah commands
RUN setcap cap_setuid=ep "$(command -v newuidmap)" && \
Expand Down
183 changes: 49 additions & 134 deletions src/installer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import subprocess
import logging
import os
import pathmod
import tempfile
from pathlib import Path
# Written Modules
from utils import cmd

class Installer:
def __init__(self, pkg_man, cname, mname, gpgcheck=True):
def __init__(self, pkg_man, cname, mname):
self.pkg_man = pkg_man
self.cname = cname
self.mname = mname
self.gpgcheck = gpgcheck

# Create temporary directory for logs, cache, etc. for package manager
os.makedirs(os.path.join(mname, "tmp"), exist_ok=True)
Expand All @@ -22,78 +21,30 @@ def __init__(self, pkg_man, cname, mname, gpgcheck=True):
# DNF complains if the log directory is not present
os.makedirs(os.path.join(self.tdir, "dnf/log"))

def install_scratch_repos(self, repos, repo_dest, proxy):
def install_scratch_repos(self, repos, repo_dest):
# check if there are repos passed for install
if len(repos) == 0:
logging.info("REPOS: no repos passed to install\n")
return

logging.info(f"REPOS: Installing these repos to {self.cname}")
for r in repos:
args = []
logging.info(r['alias'] + ': ' + r['url'])
if self.pkg_man == "zypper":
args.append("-D")
args.append(os.path.join(self.mname, pathmod.sep_strip(repo_dest)))
args.append("addrepo")
args.append("-f")
args.append("-p")
if 'priority' in r:
args.append(r['priority'])
else:
args.append('99')
args.append(r['url'])
args.append(r['alias'])
elif self.pkg_man == "dnf":
args.append("--setopt=reposdir="+os.path.join(self.mname, pathmod.sep_strip(repo_dest)))
args.append("--setopt=logdir="+os.path.join(self.tdir, self.pkg_man, "log"))
args.append("--setopt=cachedir="+os.path.join(self.tdir, self.pkg_man, "cache"))
if proxy != "":
args.append("--setopt=proxy="+proxy)
args.append("config-manager")
args.append("--save")
args.append("--add-repo")
args.append(r['url'])

rc = cmd([self.pkg_man] + args)
if rc != 0:
raise Exception("Failed to install repo", r['alias'], r['url'])

if proxy != "":
if r['url'].endswith('.repo'):
repo_name = r['url'].split('/')[-1].split('.repo')[0] + "*"
elif r['url'].startswith('https'):
repo_name = r['url'].split('https://')[1].replace('/','_')
elif r['url'].startswith('http'):
repo_name = r['url'].split('http://')[1].replace('/','_')
args = []
args.append('config-manager')
args.append('--save')
args.append("--setopt=reposdir="+os.path.join(self.mname, pathmod.sep_strip(repo_dest)))
args.append("--setopt=logdir="+os.path.join(self.tdir, self.pkg_man, "log"))
args.append("--setopt=cachedir="+os.path.join(self.tdir, self.pkg_man, "cache"))
args.append('--setopt=*.proxy='+proxy)
args.append(repo_name)

rc = cmd([self.pkg_man] + args)
if rc != 0:
raise Exception("Failed to set proxy for repo", r['alias'], r['url'], proxy)

if "gpg" in r:
# Using rpm apparently works for both Yum- and Zypper-based distros.
args = []
if proxy != "":
arg_env = os.environ.copy()
arg_env['https_proxy'] = proxy
args.append("--root="+self.mname)
args.append("--import")
args.append(r["gpg"])

rc = cmd(["rpm"] + args)
if rc != 0:
raise Exception("Failed to install gpg key for", r['alias'], "at URL", r['gpg'])

def install_scratch_packages(self, packages, registry_loc, proxy):
alias = r['alias']
config = r['config'].lstrip()

# Makes sure configs start with an alias
if not config.startswith(f'['):
config = f'[{alias}]\n{config}'

repo_path = Path(*[self.mname, pathmod.sep_strip(repo_dest), f'{alias}.repo'])
try:
repo_path.parent.mkdir(parents=True, exist_ok=True)
logging.info(f"REPOS: Writing {alias} to {repo_dest}")
with open(repo_path, "w") as f:
f.write(config)
except Exception as e:
raise Exception(f"Failed to generate repo file for r['alias'] got:\n{e}")

def install_scratch_packages(self, packages, registry_loc):
# check if there are packages to install
if len(packages) == 0:
logging.warn("PACKAGES: no packages passed to install\n")
Expand All @@ -104,26 +55,21 @@ def install_scratch_packages(self, packages, registry_loc, proxy):

args = []
if self.pkg_man == "zypper":
args.append("--non-interactive")
args.append("-n")
args.append("-D")
args.append(os.path.join(self.mname, pathmod.sep_strip(registry_loc)))
args.append("-C")
args.append(self.tdir)
args.append("--no-gpg-checks")
args.append('--no-gpg-checks')
args.append("--installroot")
args.append(self.mname)
args.append("install")
args.append("-l")
args.extend(packages)
elif self.pkg_man == "dnf":
args.append("--setopt=reposdir="+os.path.join(self.mname, pathmod.sep_strip(registry_loc)))
args.append("--setopt=logdir="+os.path.join(self.tdir, self.pkg_man, "log"))
args.append("--setopt=cachedir="+os.path.join(self.tdir, self.pkg_man, "cache"))
if proxy != "":
args.append("--setopt=proxy="+proxy)
args.append("install")
args.append("-y")
args.append("--nogpgcheck")
args.append("--installroot")
args.append(self.mname)
args.extend(packages)
Expand All @@ -135,7 +81,7 @@ def install_scratch_packages(self, packages, registry_loc, proxy):
if rc == 107:
logging.warn("one or more RPM postscripts failed to run")

def install_scratch_package_groups(self, package_groups, registry_loc, proxy):
def install_scratch_package_groups(self, package_groups):
# check if there are packages groups to install
if len(package_groups) == 0:
logging.warn("PACKAGE GROUPS: no package groups passed to install\n")
Expand All @@ -148,14 +94,8 @@ def install_scratch_package_groups(self, package_groups, registry_loc, proxy):
if self.pkg_man == "zypper":
logging.warn("zypper does not support package groups")
elif self.pkg_man == "dnf":
args.append("--setopt=reposdir="+os.path.join(self.mname, pathmod.sep_strip(registry_loc)))
args.append("--setopt=logdir="+os.path.join(self.tdir, self.pkg_man, "log"))
args.append("--setopt=cachedir="+os.path.join(self.tdir, self.pkg_man, "cache"))
if proxy != "":
args.append("--setopt=proxy="+proxy)
args.append("groupinstall")
args.append("-y")
args.append("--nogpgcheck")
args.append("--installroot")
args.append(self.mname)
args.extend(package_groups)
Expand All @@ -164,7 +104,7 @@ def install_scratch_package_groups(self, package_groups, registry_loc, proxy):
if rc == 104:
raise Exception("Installing base packages failed")

def install_scratch_modules(self, modules, registry_loc, proxy):
def install_scratch_modules(self, modules):
# check if there are modules groups to install
if len(modules) == 0:
logging.warn("PACKAGE MODULES: no modules passed to install\n")
Expand All @@ -178,68 +118,50 @@ def install_scratch_modules(self, modules, registry_loc, proxy):
logging.warn("zypper does not support package groups")
return
elif self.pkg_man == "dnf":
args.append("--setopt=reposdir="+os.path.join(self.mname, pathmod.sep_strip(registry_loc)))
args.append("--setopt=logdir="+os.path.join(self.tdir, self.pkg_man, "log"))
args.append("--setopt=cachedir="+os.path.join(self.tdir, self.pkg_man, "cache"))
if proxy != "":
args.append("--setopt=proxy="+proxy)
args.append("module")
args.append(mod_cmd)
args.append("-y")
args.append("--nogpgcheck")
args.append("--installroot")
args.append(self.mname)
args.extend(mod_list)
rc = cmd([self.pkg_man] + args)
if rc != 0:
raise Exception("Failed to run module cmd", mod_cmd, ' '.join(mod_list))

def install_repos(self, repos, proxy):
def install_repos(self, repos, repo_dest):
# check if there are repos passed for install
if len(repos) == 0:
logging.info("REPOS: no repos passed to install\n")
return

logging.info(f"REPOS: Installing these repos to {self.cname}")
for r in repos:
logging.info(r['alias'] + ': ' + r['url'])
if self.pkg_man == "zypper":
if 'priority' in r:
priority = r['priority']
else:
priority = 99
rargs = ' addrepo -f -p ' + priority + ' ' + r['url'] + ' ' + r['alias']
elif self.pkg_man == "dnf":
rargs = ' config-manager --save --add-repo ' + r['url']

args = [self.cname, '--', 'bash', '-c', self.pkg_man + rargs]
rc = cmd(["buildah","run"] + args)
if rc != 0:
raise Exception("Failed to install repo", r['alias'], r['url'])
# Set Proxy if using DNF
if proxy != "":
if r['url'].endswith('.repo'):
repo_name = r['url'].split('/')[-1].split('.repo')[0] + "*"
elif r['url'].startswith('https'):
repo_name = r['url'].split('https://')[1].replace('/','_')
elif r['url'].startswith('http'):
repo_name = r['url'].split('http://')[1].replace('/','_')
pargs = ' config-manager --save --setopt=*.proxy= ' + proxy + ' ' + repo_name

args = [self.cname, '--', 'bash', '-c', self.pkg_man + pargs]
rc = cmd(["buildah","run"] + args)
alias = r['alias']
config = r['config'].lstrip()

# Makes sure configs start with an alias
if not config.startswith(f'['):
config = f'[{alias}]\n{config}'

with tempfile.NamedTemporaryFile(mode="w", delete=False) as tmp:
tmp.write(config)
tmp_path = tmp.name

repo_path = Path(*[repo_dest, f'{alias}.repo'])
copy_config = ['buildah', 'copy' , self.cname, tmp_path, repo_path]
mkparent_dir = ['buildah', 'run', self.cname, '--', 'mkdir', '-p', repo_dest]
try:
rc = cmd(mkparent_dir)
if rc != 0:
raise Exception("Failed to set proxy for repo", r['alias'], r['url'], proxy)

if "gpg" in r:
# Using rpm apparently works for both Yum- and Zypper-based distros.
gargs = [self.cname, '--', 'bash', '-c', 'rpm --import ' + r['gpg']]
if proxy != "":
arg_env = os.environ.copy()
arg_env['https_proxy'] = proxy
rc = cmd(["buildah","run"] + gargs)
raise Exception(f"Failed to create parent dir {repo_dest}")
rc = cmd(copy_config)
if rc != 0:
raise Exception("Failed to install gpg key for", r['alias'], "at URL", r['gpg'])
raise Exception(f"Failed to generate repo config at {repo_path}")
logging.info(f"REPOS: Writing {alias} to {repo_path}")
except Exception as e:
raise Exception(f"Failed to generate repo file for r['alias'] got:\n{e}")
finally:
os.remove(tmp_path)

def install_packages(self, packages):
if len(packages) == 0:
Expand All @@ -249,11 +171,6 @@ def install_packages(self, packages):
logging.info("\n".join(packages))
args = [self.cname, '--', 'bash', '-c']
pkg_cmd = [self.pkg_man]
if self.gpgcheck is not True:
if self.pkg_man == 'dnf':
pkg_cmd.append('--nogpgcheck')
elif self.pkg_man == 'zypper':
pkg_cmd.append('--no-gpg-checks')
args.append(" ".join(pkg_cmd + [ 'install', '-y'] + packages))
cmd(["buildah","run"] + args)

Expand All @@ -267,8 +184,6 @@ def install_package_groups(self, package_groups):
pkg_cmd = [self.pkg_man, 'groupinstall', '-y']
if self.pkg_man == "zypper":
logging.warn("zypper does not support package groups")
if self.gpgcheck is not True:
pkg_cmd.append('--nogpgcheck')
args.append(" ".join(pkg_cmd + [f'"{pg}"' for pg in package_groups]))
cmd(["buildah","run"] + args)

Expand Down
Loading