@@ -196,7 +196,7 @@ async function buildAndExtendImage(buildParams: DockerResolverParameters, config
196
196
if ( buildParams . buildxPush ) {
197
197
args . push ( '--push' ) ;
198
198
} else {
199
- if ( buildParams . buildxOutput ) {
199
+ if ( buildParams . buildxOutput ) {
200
200
args . push ( '--output' , buildParams . buildxOutput ) ;
201
201
} else {
202
202
args . push ( '--load' ) ; // (short for --output=docker, i.e. load into normal 'docker images' collection)
@@ -385,18 +385,12 @@ export async function spawnDevContainer(params: DockerResolverParameters, config
385
385
) ;
386
386
387
387
const customEntrypoints = mergedConfig . entrypoints || [ ] ;
388
- const entrypoint = [ '--entrypoint' , '/bin/sh' ] ;
389
- const cmd = [ '-c' , `echo Container started
388
+ const entrypoint = typeof typeof mergedConfig . overrideCommand === 'boolean' && ! mergedConfig . overrideCommand ? [ ] : [ '--entrypoint' , '/bin/sh' ] ;
389
+ const cmd = typeof mergedConfig . overrideCommand === 'boolean' && ! mergedConfig . overrideCommand ? [ ] : [ '-c' , `echo Container started
390
390
trap "exit 0" 15
391
391
${ customEntrypoints . join ( '\n' ) }
392
392
exec "$@"
393
393
while sleep 1 & wait $!; do :; done` , '-' ] ; // `wait $!` allows for the `trap` to run (synchronous `sleep` would not).
394
- const overrideCommand = mergedConfig . overrideCommand ;
395
- if ( overrideCommand === false && imageDetails ) {
396
- const details = await imageDetails ( ) ;
397
- cmd . push ( ...details . Config . Entrypoint || [ ] ) ;
398
- cmd . push ( ...details . Config . Cmd || [ ] ) ;
399
- }
400
394
401
395
const args = [
402
396
'run' ,
0 commit comments