mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2025-02-11 13:29:19 +01:00
Code

Support Dockerfile.* in _multibuild packages

Browse Source 
The suffix can be
   packageid
   flavor
   packageid-reponame
   flavor-reponame

Also adding support already for "Containerfile", support will
come to OBS as well (same file, just different name)
This commit is contained in:
Adrian Schröter 2024-09-26 13:09:20 +02:00
parent f567060044
commit 0ded12a014
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osc/build.py
View File

@ -767,7 +767,9 @@ def main(apiurl, store, opts, argv):
build_type = 'snapcraft'
if os.path.basename(build_descr) == 'simpleimage':
build_type = 'simpleimage'
if os.path.basename(build_descr) == 'Dockerfile':
if os.path.basename(build_descr) == 'Containerfile' or os.path.basename(build_descr).startswith('Containerfile.'):
build_type = 'docker'
if os.path.basename(build_descr) == 'Dockerfile' or os.path.basename(build_descr).startswith('Dockerfile.'):
build_type = 'docker'
if os.path.basename(build_descr) == 'fissile.yml':
build_type = 'fissile'

6
osc/commandline.py
View File

@ -7029,8 +7029,9 @@ Please submit there instead, or use --nodevelproject to force direct submission.
if (arg.endswith('.spec') or arg.endswith('.dsc') or
arg.endswith('.kiwi') or arg.endswith('.livebuild') or
arg.endswith('flatpak.yaml') or arg.endswith('flatpak.yml') or
arg.endswith('flatpak.json') or
arg in ('PKGBUILD', 'build.collax', 'Chart.yaml', 'Dockerfile',
arg.endswith('flatpak.json') or arg.startswith('Dockerfile.') or
arg.startswith('Containerfile.') or
arg in ('PKGBUILD', 'build.collax', 'Chart.yaml', 'Containerfile', 'Dockerfile',
'fissile.yml', 'appimage.yml', '_preinstallimage')):
arg_descr = arg
else:
@ -7099,6 +7100,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
# but be a bit more readable :)
descr = glob.glob('*.spec') + glob.glob('*.dsc') + glob.glob('*.kiwi') + glob.glob('*.livebuild') + \
glob.glob('PKGBUILD') + glob.glob('build.collax') + glob.glob('Dockerfile') + \
glob.glob('Dockerfile.*') + glob.glob('Containerfile') + glob.glob('Containerfile.*') + \
glob.glob('fissile.yml') + glob.glob('appimage.yml') + glob.glob('Chart.yaml') + \
glob.glob('*flatpak.yaml') + glob.glob('*flatpak.yml') + glob.glob('*flatpak.json') + \
glob.glob('*.productcompose')