Merge pull request #161 from crazy-max/fix-remote
skip setting buildkitd flags and config for remote driver
This commit is contained in:
		
							
								
								
									
										2
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										12
									
								
								src/main.ts
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								src/main.ts
									
									
									
									
									
								
							@@ -63,7 +63,7 @@ async function run(): Promise<void> {
 | 
			
		||||
        await context.asyncForEach(inputs.driverOpts, async driverOpt => {
 | 
			
		||||
          createArgs.push('--driver-opt', driverOpt);
 | 
			
		||||
        });
 | 
			
		||||
        if (inputs.buildkitdFlags) {
 | 
			
		||||
        if (inputs.driver != 'remote' && inputs.buildkitdFlags) {
 | 
			
		||||
          createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
@@ -73,10 +73,12 @@ async function run(): Promise<void> {
 | 
			
		||||
      if (inputs.endpoint) {
 | 
			
		||||
        createArgs.push(inputs.endpoint);
 | 
			
		||||
      }
 | 
			
		||||
      if (inputs.config) {
 | 
			
		||||
        createArgs.push('--config', await buildx.getConfigFile(inputs.config));
 | 
			
		||||
      } else if (inputs.configInline) {
 | 
			
		||||
        createArgs.push('--config', await buildx.getConfigInline(inputs.configInline));
 | 
			
		||||
      if (inputs.driver != 'remote') {
 | 
			
		||||
        if (inputs.config) {
 | 
			
		||||
          createArgs.push('--config', await buildx.getConfigFile(inputs.config));
 | 
			
		||||
        } else if (inputs.configInline) {
 | 
			
		||||
          createArgs.push('--config', await buildx.getConfigInline(inputs.configInline));
 | 
			
		||||
        }
 | 
			
		||||
      }
 | 
			
		||||
      const createCmd = buildx.getCommand(createArgs, standalone);
 | 
			
		||||
      await exec.exec(createCmd.commandLine, createCmd.args);
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user