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

Fixes

Browse source
This commit is contained in:
Joseph Schorr 2015-02-05 17:37:58 -05:00
parent 83c676f3f7
commit e1c5ccb7d6
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
data/migrations/versions/5ad999136045_add_signature_storage.py
View file

@ -37,6 +37,11 @@ def upgrade(tables):
op.create_index('imagestoragesignature_storage_id', 'imagestoragesignature', ['storage_id'], unique=False) op.create_index('imagestoragesignature_storage_id', 'imagestoragesignature', ['storage_id'], unique=False)
### end Alembic commands ### ### end Alembic commands ###
op.bulk_insert(tables.imagestoragetransformation,
[
{'id': 2, 'name':'aci'},
])
op.bulk_insert(tables.imagestoragesignaturekind, op.bulk_insert(tables.imagestoragesignaturekind,
[ [
{'id': 1, 'name':'gpg2'}, {'id': 1, 'name':'gpg2'},

4
formats/aci.py
View file

@ -146,8 +146,8 @@ class ACIImage(TarImageFormatter):
# ACI requires that the execution command be absolutely referenced. Therefore, if we find # ACI requires that the execution command be absolutely referenced. Therefore, if we find
# a relative command, we give it as an argument to /bin/sh to resolve and execute for us. # a relative command, we give it as an argument to /bin/sh to resolve and execute for us.
entrypoint = config.get('Entrypoint') or [] entrypoint = config.get('Entrypoint', []) or []
exec_path = entrypoint + config.get('Cmd') or [] exec_path = entrypoint + (config.get('Cmd', []) or [])
if exec_path and not exec_path[0].startswith('/'): if exec_path and not exec_path[0].startswith('/'):
exec_path = ['/bin/sh', '-c', '""%s""' % ' '.join(exec_path)] exec_path = ['/bin/sh', '-c', '""%s""' % ' '.join(exec_path)]