- Make sure to send the subdirectory when restarting a build
- Make sure to use the subdirectory to read the Dockerfile's location in a build package, and display the path - Nicer UI for showing the trigger description in the build view - Fix an NPE in the file change tree
This commit is contained in:
parent
3006b7b749
commit
89d9bcd894
8 changed files with 51 additions and 8 deletions
|
@ -1239,7 +1239,10 @@ def request_repo_build(namespace, repository):
|
|||
permission = ModifyRepositoryPermission(namespace, repository)
|
||||
if permission.can():
|
||||
logger.debug('User requested repository initialization.')
|
||||
dockerfile_id = request.get_json()['file_id']
|
||||
request_json = request.get_json()
|
||||
|
||||
dockerfile_id = request_json['file_id']
|
||||
subdir = request_json['subdirectory'] if 'subdirectory' in request_json else ''
|
||||
|
||||
# Check if the dockerfile resource has already been used. If so, then it
|
||||
# can only be reused if the user has access to the repository for which it
|
||||
|
@ -1255,7 +1258,7 @@ def request_repo_build(namespace, repository):
|
|||
display_name = user_files.get_file_checksum(dockerfile_id)
|
||||
|
||||
build_request = start_build(repo, dockerfile_id, ['latest'], display_name,
|
||||
'', True)
|
||||
subdir, True)
|
||||
|
||||
resp = jsonify(build_status_view(build_request, True))
|
||||
repo_string = '%s/%s' % (namespace, repository)
|
||||
|
|
Reference in a new issue