@@ -254,7 +254,7 @@ async def client(
254
254
server : Annotated [str , Doc ("Server address" )],
255
255
ca : Annotated [dagger .File | None , Doc ("Certificate authority" )] = None ,
256
256
cert : Annotated [dagger .File | None , Doc ("Client certificate" )] = None ,
257
- key : Annotated [dagger .File | None , Doc ("Client certificate key" )] = None ,
257
+ key : Annotated [dagger .Secret | None , Doc ("Client certificate key" )] = None ,
258
258
tunnel_health_port : Annotated [int , Doc ("Health tunnel port" )] = 9081 ,
259
259
) -> dagger .Container :
260
260
"""Return the ggbridge client container"""
@@ -273,9 +273,15 @@ async def client(
273
273
)
274
274
if tls_enabled :
275
275
container = (
276
- container .with_mounted_file ("/etc/ggbridge/tls/ca.crt" , source = ca )
277
- .with_mounted_file ("/etc/ggbridge/tls/client.crt" , source = cert )
278
- .with_mounted_file ("/etc/ggbridge/tls/client.key" , source = key )
276
+ container .with_mounted_file (
277
+ "/etc/ggbridge/tls/ca.crt" , source = ca , owner = "nonroot"
278
+ )
279
+ .with_mounted_file (
280
+ "/etc/ggbridge/tls/client.crt" , source = cert , owner = "nonroot"
281
+ )
282
+ .with_mounted_secret (
283
+ "/etc/ggbridge/tls/client.key" , source = key , owner = "nonroot"
284
+ )
279
285
)
280
286
return container
281
287
@@ -284,7 +290,7 @@ async def server(
284
290
self ,
285
291
ca : Annotated [dagger .File | None , Doc ("Certificate authority" )] = None ,
286
292
cert : Annotated [dagger .File | None , Doc ("Client certificate" )] = None ,
287
- key : Annotated [dagger .File | None , Doc ("Client certificate key" )] = None ,
293
+ key : Annotated [dagger .Secret | None , Doc ("Client certificate key" )] = None ,
288
294
port : Annotated [int , Doc ("Server port" )] = 9000 ,
289
295
tunnel_health_port : Annotated [int , Doc ("Health port" )] = 9081 ,
290
296
tunnel_socks_port : Annotated [int , Doc ("Socks port" )] = 9180 ,
@@ -318,9 +324,15 @@ async def server(
318
324
)
319
325
if tls_enabled :
320
326
container = (
321
- container .with_mounted_file ("/etc/ggbridge/tls/ca.crt" , source = ca )
322
- .with_mounted_file ("/etc/ggbridge/tls/server.crt" , source = cert )
323
- .with_mounted_file ("/etc/ggbridge/tls/server.key" , source = key )
327
+ container .with_mounted_file (
328
+ "/etc/ggbridge/tls/ca.crt" , source = ca , owner = "nonroot"
329
+ )
330
+ .with_mounted_file (
331
+ "/etc/ggbridge/tls/server.crt" , source = cert , owner = "nonroot"
332
+ )
333
+ .with_mounted_secret (
334
+ "/etc/ggbridge/tls/server.key" , source = key , owner = "nonroot"
335
+ )
324
336
)
325
337
return container
326
338
@@ -360,7 +372,7 @@ async def scan(
360
372
output_format : Annotated [str , Doc ("Report output formatter" )] = "table" ,
361
373
) -> dagger .File :
362
374
"""Scan the ggbridge image using grype"""
363
- return self .image ().scan (
375
+ return await self .image ().scan (
364
376
variant = variant , severity = severity , output_format = output_format
365
377
)
366
378
0 commit comments