vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2409 from coreos-inc/dockerfile-hack

Browse source 
Add a temporary HACK to work around bad path logic in trigger
This commit is contained in:
josephschorr 2017-03-07 23:40:36 -05:00 committed by GitHub
commit 88fcb199db
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
buildman/component/buildcomponent.py
View file

@ -126,6 +126,14 @@ class BuildComponent(BaseComponent):
subdir, dockerfile_name = os.path.split(build_config.get('build_subdir', '/Dockerfile'))
# HACK HACK HACK HACK HACK HACK HACK
# TODO: FIX THIS in the database and then turn the split back on.
if dockerfile_name.find('Dockerfile') < 0:
# This is a *HACK* for the broken path handling. To be fixed ASAP.
subdir = build_config.get('build_subdir') or '/'
dockerfile_name = 'Dockerfile'
# /HACK HACK HACK HACK HACK HACK HACK
build_arguments = {
'build_package': build_job.get_build_package_url(self.user_files),
'sub_directory': subdir,