Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/NERSC/shifter into xattr
Browse files Browse the repository at this point in the history
  • Loading branch information
scanon committed Apr 27, 2018
2 parents 83ee491 + 474d857 commit 89ebb0b
Show file tree
Hide file tree
Showing 17 changed files with 702 additions and 334 deletions.
11 changes: 11 additions & 0 deletions NEWS
@@ -1,3 +1,14 @@
18.03.1
========
* Add support for clearing the external environment
* Add support for user specifying environment variables on command line
* Add support for user specifying environment variables via a file
* Fix entrypoint bug to not require an argument if the image specifies an entrypoint
* Fix workdir bug to only use the image workdir when the --workdir option is specified
* Fix user/group acl parsing bug and improve error handling
* Fix bug in environment variable matching
* Add SHIFTER_IMAGEREQUEST and SHIFTER_IMAGE environment variables in the shifter environment to show the requested image tag and resolved id

18.03.0
=========
* Support for Private Repos and user supplied ACLs on private images
Expand Down
1 change: 1 addition & 0 deletions imagegw/shifter_imagegw/imagemngr.py
Expand Up @@ -713,6 +713,7 @@ def update_acls(self, ident, response):
self.update_mongo(ident, response)
self.add_tag(ident, pullrec['system'], pullrec['pulltag'])
else:
self.add_tag(rec['_id'], pullrec['system'], pullrec['pulltag'])
updates = {
'userACL': response['userACL'],
'groupACL': response['groupACL'],
Expand Down
2 changes: 1 addition & 1 deletion imagegw/shifter_imagegw/imageworker.py
Expand Up @@ -495,7 +495,7 @@ def pull(request, updater, testmode=0):
if not transfer_image(request):
raise OSError('Transfer failed')
else:
logging.debug("Need to update metadata")
logging.debug("Updating metdata for %s" % (request['tag']))
request['format'] = get_image_format(request)

if not write_metadata(request):
Expand Down

0 comments on commit 89ebb0b

Please sign in to comment.