File tree Expand file tree Collapse file tree 3 files changed +17
-18
lines changed Expand file tree Collapse file tree 3 files changed +17
-18
lines changed Original file line number Diff line number Diff line change @@ -244,11 +244,11 @@ class VersionHandler(BaseHandler):
244244
245245 async def get (self ):
246246 self .set_header ("Content-type" , "application/json" )
247- self . write (
248- json . dumps (
249- {
250- "builder" : self . settings [ "example_builder" ]. identifier ,
251- "binderhub" : binder_version ,
252- }
253- )
254- )
247+ r = {
248+ "builder_info" : self . settings [ "example_builder" ]. builder_info ,
249+ "binderhub" : binder_version ,
250+ }
251+ # Backwards compatibility
252+ if "build_image" in r [ "builder_info" ]:
253+ r [ "builder" ] = r [ "builder_info" ][ "build_image" ]
254+ self . write ( json . dumps ( r ) )
Original file line number Diff line number Diff line change @@ -101,10 +101,9 @@ class BuildExecutor(LoggingConfigurable):
101101 config = True ,
102102 )
103103
104- identifier = Unicode (
105- "" ,
104+ builder_info = Dict (
106105 help = (
107- "Identifier or other metadata for the builder e.g. repo2docker version. "
106+ "Metadata about the builder e.g. repo2docker version. "
108107 "This is included in the BinderHub version endpoint"
109108 ),
110109 config = True ,
@@ -248,9 +247,9 @@ def _default_namespace(self):
248247 config = True ,
249248 )
250249
251- @default ("identifier " )
252- def _default_identifier (self ):
253- return self .build_image
250+ @default ("builder_info " )
251+ def _default_builder_info (self ):
252+ return { "build_image" : self .build_image }
254253
255254 docker_host = Unicode (
256255 "/var/run/docker.sock" ,
Original file line number Diff line number Diff line change @@ -112,15 +112,15 @@ class LocalRepo2dockerBuild(BuildExecutor):
112112 WARNING: This is still under development. Breaking changes may be made at any time.
113113 """
114114
115- @default ("identifier " )
116- def _default_identifier (self ):
115+ @default ("builder_info " )
116+ def _default_builder_info (self ):
117117 try :
118118 import repo2docker
119119
120- return repo2docker .__version__
120+ return { " repo2docker-version" : repo2docker .__version__ }
121121 except ImportError :
122122 self .log .error ("repo2docker not installed" )
123- return ""
123+ return {}
124124
125125 def submit (self ):
126126 """
You can’t perform that action at this time.
0 commit comments