TT#17622 release_dashboard: allow master for docker builds

* fix Dockerfile documentation

Change-Id: Id1aa6d2bc164b51ff0c788ef64530fdca4caa08f
changes/82/13982/1
Victor Seva 9 years ago
parent f243507b17
commit 84932e38cf

@ -8,7 +8,7 @@ $('select#common_select').change(function() {
if(selected_version.match(/^branch/)) { if(selected_version.match(/^branch/)) {
if(selected_version.match(/^branch\/master/)) { if(selected_version.match(/^branch\/master/)) {
var distribution = $('select#distribution option:selected').val(); var distribution = $('select#distribution option:selected').val();
if(!distribution.match(/^auto/)) { if(distribution && !distribution.match(/^auto/)) {
version = 'trunk' + '-' + distribution; version = 'trunk' + '-' + distribution;
} }
} }

@ -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,
} }

@ -36,7 +36,7 @@ WORKDIR /code/
# ./t/testrunner # ./t/testrunner
# #
# Run django inside docker: # Run django inside docker:
# % pip install -r t/dev.txt && make run_dev # % pip install -r requirements/dev.txt && make run_dev
# #
# We need a working rabbit server, so in another terminal: # We need a working rabbit server, so in another terminal:
# % docker run --rm --hostname repoapi-rabbit --name repoapi-rabbit rabbitmq:3 # % docker run --rm --hostname repoapi-rabbit --name repoapi-rabbit rabbitmq:3

Loading…
Cancel
Save