mirror of
https://github.com/docker/setup-buildx-action.git
synced 2024-11-15 16:33:50 +08:00
Remove hardcoded buildkit container image moby/buildkit:v0.8-beta
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
parent
c3c3e01512
commit
ca778fe8a3
8
dist/index.js
generated
vendored
8
dist/index.js
generated
vendored
@ -541,17 +541,9 @@ function run() {
|
|||||||
core.startGroup(`🔨 Creating a new builder instance`);
|
core.startGroup(`🔨 Creating a new builder instance`);
|
||||||
let createArgs = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
|
let createArgs = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
|
||||||
if (semver.satisfies(buildxVersion, '>=0.3.0')) {
|
if (semver.satisfies(buildxVersion, '>=0.3.0')) {
|
||||||
let hasImageDriverOpt = false;
|
|
||||||
yield context.asyncForEach(inputs.driverOpts, (driverOpt) => __awaiter(this, void 0, void 0, function* () {
|
yield context.asyncForEach(inputs.driverOpts, (driverOpt) => __awaiter(this, void 0, void 0, function* () {
|
||||||
if (driverOpt.startsWith('image=')) {
|
|
||||||
hasImageDriverOpt = true;
|
|
||||||
}
|
|
||||||
createArgs.push('--driver-opt', driverOpt);
|
createArgs.push('--driver-opt', driverOpt);
|
||||||
}));
|
}));
|
||||||
if (!hasImageDriverOpt) {
|
|
||||||
//FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
|
|
||||||
createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
|
|
||||||
}
|
|
||||||
if (inputs.buildkitdFlags) {
|
if (inputs.buildkitdFlags) {
|
||||||
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
|
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
|
||||||
}
|
}
|
||||||
|
@ -36,17 +36,9 @@ async function run(): Promise<void> {
|
|||||||
core.startGroup(`🔨 Creating a new builder instance`);
|
core.startGroup(`🔨 Creating a new builder instance`);
|
||||||
let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
|
let createArgs: Array<string> = ['buildx', 'create', '--name', builderName, '--driver', inputs.driver];
|
||||||
if (semver.satisfies(buildxVersion, '>=0.3.0')) {
|
if (semver.satisfies(buildxVersion, '>=0.3.0')) {
|
||||||
let hasImageDriverOpt: boolean = false;
|
|
||||||
await context.asyncForEach(inputs.driverOpts, async driverOpt => {
|
await context.asyncForEach(inputs.driverOpts, async driverOpt => {
|
||||||
if (driverOpt.startsWith('image=')) {
|
|
||||||
hasImageDriverOpt = true;
|
|
||||||
}
|
|
||||||
createArgs.push('--driver-opt', driverOpt);
|
createArgs.push('--driver-opt', driverOpt);
|
||||||
});
|
});
|
||||||
if (!hasImageDriverOpt) {
|
|
||||||
//FIXME: Temporary fix (docker/build-push-action#154, docker/build-push-action#162)
|
|
||||||
createArgs.push('--driver-opt', 'image=moby/buildkit:v0.8-beta');
|
|
||||||
}
|
|
||||||
if (inputs.buildkitdFlags) {
|
if (inputs.buildkitdFlags) {
|
||||||
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
|
createArgs.push('--buildkitd-flags', inputs.buildkitdFlags);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user