Skip to content

Commit 594f3bf

Browse files
authored
Merge pull request #609 from crazy-max/pull-buildkit-image-before-create
pull BuildKit image before builder creation
2 parents e823525 + bd6e702 commit 594f3bf

3 files changed

Lines changed: 121 additions & 89 deletions

File tree

‎dist/index.cjs‎

Lines changed: 82 additions & 82 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.cjs.map‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/main.ts‎

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,33 @@ actionsToolkit.run(
124124
}
125125
}
126126

127+
let builderExists = false;
128+
if (inputs.driver !== 'docker') {
129+
builderExists = await toolkit.builder.exists(inputs.name);
130+
}
131+
132+
const appendNodes = inputs.append ? (yaml.load(inputs.append) as Node[]) : [];
133+
134+
if (!standalone && inputs.driver == 'docker-container') {
135+
const buildkitImages = new Set<string>();
136+
if (!builderExists) {
137+
buildkitImages.add(resolveBuildKitImage(inputs.driverOpts));
138+
}
139+
for (const node of appendNodes) {
140+
buildkitImages.add(resolveBuildKitImage(node['driver-opts']));
141+
}
142+
if (buildkitImages.size > 0) {
143+
await core.group(`Pulling BuildKit image(s)`, async () => {
144+
for (const image of buildkitImages) {
145+
await Docker.pull(image);
146+
}
147+
});
148+
}
149+
}
150+
127151
if (inputs.driver !== 'docker') {
128152
await core.group(`Creating a new builder instance`, async () => {
129-
if (await toolkit.builder.exists(inputs.name)) {
153+
if (builderExists) {
130154
core.info(`Builder ${inputs.name} already exists, skipping creation`);
131155
} else {
132156
const certsDriverOpts = Buildx.resolveCertsDriverOpts(inputs.driver, inputs.endpoint, {
@@ -149,11 +173,10 @@ actionsToolkit.run(
149173
});
150174
}
151175

152-
if (inputs.append) {
176+
if (appendNodes.length > 0) {
153177
await core.group(`Appending node(s) to builder`, async () => {
154178
let nodeIndex = 1;
155-
const nodes = yaml.load(inputs.append) as Node[];
156-
for (const node of nodes) {
179+
for (const node of appendNodes) {
157180
const certsDriverOpts = Buildx.resolveCertsDriverOpts(inputs.driver, `${node.endpoint}`, {
158181
cacert: process.env[`${context.builderNodeEnvPrefix}_${nodeIndex}_AUTH_TLS_CACERT`],
159182
cert: process.env[`${context.builderNodeEnvPrefix}_${nodeIndex}_AUTH_TLS_CERT`],
@@ -274,3 +297,12 @@ actionsToolkit.run(
274297
}
275298
}
276299
);
300+
301+
function resolveBuildKitImage(driverOpts: string[] = []): string {
302+
return (
303+
driverOpts
304+
.find(driverOpt => driverOpt.trim().startsWith('image='))
305+
?.trim()
306+
.substring('image='.length) || 'moby/buildkit:buildx-stable-1'
307+
);
308+
}

0 commit comments

Comments
 (0)