mirror of
				https://gitea.com/docker/build-push-action.git
				synced 2025-10-31 00:58:18 +07:00 
			
		
		
		
	Add buildkitd-flags for setup-buildx
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									807389ab0d
								
							
						
					
					
						commit
						82c243c14d
					
				| @ -92,10 +92,11 @@ jobs: | ||||
| Following inputs can be used as `step.with` keys | ||||
| 
 | ||||
| | Name               | Type    | Default                           | Description                        | | ||||
| |------------------|---------|-----------------------------------|------------------------------------| | ||||
| |--------------------|---------|-----------------------------------|------------------------------------| | ||||
| | `version`          | String  | _the one installed on the runner_ | [Buildx](https://github.com/docker/buildx) version. e.g. `v0.3.0`, `latest` | | ||||
| | `driver`           | String  | `docker-container`                | Sets the [builder driver](https://github.com/docker/buildx#--driver-driver) to be used. | | ||||
| | `driver-opt`       | String  |                                   | Passes additional [driver-specific options](https://github.com/docker/buildx#--driver-opt-options). e.g. `image=moby/buildkit:master` | | ||||
| | `buildkitd-flags`  | String  |                                   | [Flags for buildkitd](https://github.com/moby/buildkit/blob/master/docs/buildkitd.toml.md) daemon. | | ||||
| | `install`          | Bool    | `false`                           | Sets up `docker build` command as an alias to `docker buildx` | | ||||
| | `use`              | Bool    | `true`                            | Switch to this builder instance | | ||||
| 
 | ||||
|  | ||||
| @ -17,6 +17,9 @@ inputs: | ||||
|   driver-opt: | ||||
|     description: 'Passes additional driver-specific options. Eg. image=moby/buildkit:master' | ||||
|     required: false | ||||
|   buildkitd-flags: | ||||
|     description: 'Flags for buildkitd daemon' | ||||
|     required: false | ||||
|   install: | ||||
|     description: 'Sets up docker build command as an alias to docker buildx' | ||||
|     default: 'false' | ||||
|  | ||||
							
								
								
									
										6
									
								
								setup-buildx/dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								setup-buildx/dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -2493,6 +2493,7 @@ function run() { | ||||
|             const bxVersion = core.getInput('version'); | ||||
|             const bxDriver = core.getInput('driver') || 'docker-container'; | ||||
|             const bxDriverOpt = core.getInput('driver-opt'); | ||||
|             const bxBuildkitdFlags = core.getInput('buildkitd-flags'); | ||||
|             const bxInstall = /true/i.test(core.getInput('install')); | ||||
|             const bxUse = /true/i.test(core.getInput('use')); | ||||
|             const dockerConfigHome = process.env.DOCKER_CONFIG || path.join(os.homedir(), '.docker'); | ||||
| @ -2501,7 +2502,7 @@ function run() { | ||||
|             } | ||||
|             core.info('📣 Buildx info'); | ||||
|             yield exec.exec('docker', ['buildx', 'version']); | ||||
|             const builderName = `builder-${(yield buildx.countBuilders()) + 1}-${process.env.GITHUB_JOB}`; | ||||
|             const builderName = `builder-${process.env.GITHUB_JOB}-${(yield buildx.countBuilders()) + 1}`; | ||||
|             core.setOutput('name', builderName); | ||||
|             stateHelper.setBuilderName(builderName); | ||||
|             core.info('🔨 Creating a new builder instance...'); | ||||
| @ -2509,6 +2510,9 @@ function run() { | ||||
|             if (bxDriverOpt) { | ||||
|                 createArgs.push('--driver-opt', bxDriverOpt); | ||||
|             } | ||||
|             if (bxBuildkitdFlags) { | ||||
|                 createArgs.push('--buildkitd-flags', bxBuildkitdFlags); | ||||
|             } | ||||
|             if (bxUse) { | ||||
|                 createArgs.push('--use'); | ||||
|             } | ||||
|  | ||||
| @ -16,6 +16,7 @@ async function run(): Promise<void> { | ||||
|     const bxVersion: string = core.getInput('version'); | ||||
|     const bxDriver: string = core.getInput('driver') || 'docker-container'; | ||||
|     const bxDriverOpt: string = core.getInput('driver-opt'); | ||||
|     const bxBuildkitdFlags: string = core.getInput('buildkitd-flags'); | ||||
|     const bxInstall: boolean = /true/i.test(core.getInput('install')); | ||||
|     const bxUse: boolean = /true/i.test(core.getInput('use')); | ||||
| 
 | ||||
| @ -28,7 +29,7 @@ async function run(): Promise<void> { | ||||
|     core.info('📣 Buildx info'); | ||||
|     await exec.exec('docker', ['buildx', 'version']); | ||||
| 
 | ||||
|     const builderName: string = `builder-${(await buildx.countBuilders()) + 1}-${process.env.GITHUB_JOB}`; | ||||
|     const builderName: string = `builder-${process.env.GITHUB_JOB}-${(await buildx.countBuilders()) + 1}`; | ||||
|     core.setOutput('name', builderName); | ||||
|     stateHelper.setBuilderName(builderName); | ||||
| 
 | ||||
| @ -37,6 +38,9 @@ async function run(): Promise<void> { | ||||
|     if (bxDriverOpt) { | ||||
|       createArgs.push('--driver-opt', bxDriverOpt); | ||||
|     } | ||||
|     if (bxBuildkitdFlags) { | ||||
|       createArgs.push('--buildkitd-flags', bxBuildkitdFlags); | ||||
|     } | ||||
|     if (bxUse) { | ||||
|       createArgs.push('--use'); | ||||
|     } | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user