|
|
|
@ -42,7 +42,7 @@ def index(request):
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def _projects_versions(projects, regex=None,
|
|
|
|
def _projects_versions(projects, regex=None,
|
|
|
|
tags=True, branches=True):
|
|
|
|
tags=True, branches=True, master=False):
|
|
|
|
res = []
|
|
|
|
res = []
|
|
|
|
for project in projects:
|
|
|
|
for project in projects:
|
|
|
|
info = {
|
|
|
|
info = {
|
|
|
|
@ -52,6 +52,8 @@ def _projects_versions(projects, regex=None,
|
|
|
|
info['tags'] = get_tags(project, regex)
|
|
|
|
info['tags'] = get_tags(project, regex)
|
|
|
|
if branches:
|
|
|
|
if branches:
|
|
|
|
info['branches'] = get_branches(project, regex)
|
|
|
|
info['branches'] = get_branches(project, regex)
|
|
|
|
|
|
|
|
if master:
|
|
|
|
|
|
|
|
info['branches'].append('master')
|
|
|
|
res.append(info)
|
|
|
|
res.append(info)
|
|
|
|
logger.debug(res)
|
|
|
|
logger.debug(res)
|
|
|
|
return res
|
|
|
|
return res
|
|
|
|
@ -286,10 +288,11 @@ def build_docker_images(request):
|
|
|
|
regex_mr,
|
|
|
|
regex_mr,
|
|
|
|
False,
|
|
|
|
False,
|
|
|
|
True,
|
|
|
|
True,
|
|
|
|
|
|
|
|
True,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
'common_versions': {
|
|
|
|
'common_versions': {
|
|
|
|
'tags': [],
|
|
|
|
'tags': [],
|
|
|
|
'branches': []
|
|
|
|
'branches': ['master', ]
|
|
|
|
},
|
|
|
|
},
|
|
|
|
'docker': True,
|
|
|
|
'docker': True,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|