@docker/actions-toolkit 0.1.0-beta.11 → 0.1.0-beta.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/buildkit/buildkit.d.ts +1 -4
- package/lib/buildkit/buildkit.js +11 -23
- package/lib/buildkit/buildkit.js.map +1 -1
- package/lib/buildkit/config.d.ts +0 -3
- package/lib/buildkit/config.js +2 -4
- package/lib/buildkit/config.js.map +1 -1
- package/lib/buildx/builder.d.ts +1 -4
- package/lib/buildx/builder.js +4 -34
- package/lib/buildx/builder.js.map +1 -1
- package/lib/buildx/buildx.d.ts +3 -5
- package/lib/buildx/buildx.js +29 -26
- package/lib/buildx/buildx.js.map +1 -1
- package/lib/buildx/inputs.d.ts +0 -3
- package/lib/buildx/inputs.js +8 -11
- package/lib/buildx/inputs.js.map +1 -1
- package/lib/buildx/install.d.ts +4 -7
- package/lib/buildx/install.js +50 -56
- package/lib/buildx/install.js.map +1 -1
- package/lib/context.d.ts +6 -7
- package/lib/context.js +18 -13
- package/lib/context.js.map +1 -1
- package/lib/docker.d.ts +3 -7
- package/lib/docker.js +23 -48
- package/lib/docker.js.map +1 -1
- package/lib/exec.d.ts +20 -0
- package/lib/exec.js +68 -0
- package/lib/exec.js.map +1 -0
- package/lib/git.js +3 -28
- package/lib/git.js.map +1 -1
- package/lib/github.js +3 -5
- package/lib/github.js.map +1 -1
- package/lib/toolkit.d.ts +0 -2
- package/lib/toolkit.js +4 -6
- package/lib/toolkit.js.map +1 -1
- package/package.json +1 -1
|
@@ -13,19 +13,16 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Context } from '../context';
|
|
17
16
|
import { Buildx } from '../buildx/buildx';
|
|
18
17
|
import { Config } from './config';
|
|
19
18
|
import { BuilderInfo, NodeInfo } from '../types/builder';
|
|
20
19
|
export interface BuildKitOpts {
|
|
21
|
-
context: Context;
|
|
22
20
|
buildx?: Buildx;
|
|
23
21
|
}
|
|
24
22
|
export declare class BuildKit {
|
|
25
|
-
private readonly context;
|
|
26
23
|
private readonly buildx;
|
|
27
24
|
readonly config: Config;
|
|
28
|
-
constructor(opts
|
|
25
|
+
constructor(opts?: BuildKitOpts);
|
|
29
26
|
getVersion(node: NodeInfo): Promise<string | undefined>;
|
|
30
27
|
private getVersionWithinImage;
|
|
31
28
|
versionSatisfies(builderName: string, range: string, builderInfo?: BuilderInfo): Promise<boolean>;
|
package/lib/buildkit/buildkit.js
CHANGED
|
@@ -49,20 +49,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
49
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
50
|
exports.BuildKit = void 0;
|
|
51
51
|
const core = __importStar(require("@actions/core"));
|
|
52
|
-
const exec = __importStar(require("@actions/exec"));
|
|
53
52
|
const semver = __importStar(require("semver"));
|
|
54
53
|
const buildx_1 = require("../buildx/buildx");
|
|
55
54
|
const builder_1 = require("../buildx/builder");
|
|
56
55
|
const config_1 = require("./config");
|
|
56
|
+
const exec_1 = require("../exec");
|
|
57
57
|
class BuildKit {
|
|
58
58
|
constructor(opts) {
|
|
59
|
-
this.
|
|
60
|
-
this.
|
|
61
|
-
this.buildx =
|
|
62
|
-
(opts === null || opts === void 0 ? void 0 : opts.buildx) ||
|
|
63
|
-
new buildx_1.Buildx({
|
|
64
|
-
context: this.context
|
|
65
|
-
});
|
|
59
|
+
this.config = new config_1.Config();
|
|
60
|
+
this.buildx = (opts === null || opts === void 0 ? void 0 : opts.buildx) || new buildx_1.Buildx();
|
|
66
61
|
}
|
|
67
62
|
getVersion(node) {
|
|
68
63
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -80,20 +75,16 @@ class BuildKit {
|
|
|
80
75
|
getVersionWithinImage(nodeName) {
|
|
81
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
82
77
|
core.debug(`BuildKit.getVersionWithinImage nodeName: ${nodeName}`);
|
|
83
|
-
return
|
|
84
|
-
.getExecOutput(`docker`, ['inspect', '--format', '{{.Config.Image}}', `${buildx_1.Buildx.containerNamePrefix}${nodeName}`], {
|
|
78
|
+
return exec_1.Exec.getExecOutput(`docker`, ['inspect', '--format', '{{.Config.Image}}', `${buildx_1.Buildx.containerNamePrefix}${nodeName}`], {
|
|
85
79
|
ignoreReturnCode: true,
|
|
86
80
|
silent: true
|
|
87
|
-
})
|
|
88
|
-
.then(bkitimage => {
|
|
81
|
+
}).then(bkitimage => {
|
|
89
82
|
if (bkitimage.exitCode == 0 && bkitimage.stdout.length > 0) {
|
|
90
83
|
core.debug(`BuildKit.getVersionWithinImage image: ${bkitimage.stdout.trim()}`);
|
|
91
|
-
return
|
|
92
|
-
.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
|
|
84
|
+
return exec_1.Exec.getExecOutput(`docker`, ['run', '--rm', bkitimage.stdout.trim(), '--version'], {
|
|
93
85
|
ignoreReturnCode: true,
|
|
94
86
|
silent: true
|
|
95
|
-
})
|
|
96
|
-
.then(bkitversion => {
|
|
87
|
+
}).then(bkitversion => {
|
|
97
88
|
if (bkitversion.exitCode == 0 && bkitversion.stdout.length > 0) {
|
|
98
89
|
return `${bkitimage.stdout.trim()} => ${bkitversion.stdout.trim()}`;
|
|
99
90
|
}
|
|
@@ -113,24 +104,21 @@ class BuildKit {
|
|
|
113
104
|
versionSatisfies(builderName, range, builderInfo) {
|
|
114
105
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
106
|
if (!builderInfo) {
|
|
116
|
-
builderInfo = yield new builder_1.Builder({
|
|
117
|
-
context: this.context,
|
|
118
|
-
buildx: this.buildx
|
|
119
|
-
}).inspect(builderName);
|
|
107
|
+
builderInfo = yield new builder_1.Builder({ buildx: this.buildx }).inspect(builderName);
|
|
120
108
|
}
|
|
121
109
|
for (const node of builderInfo.nodes) {
|
|
122
|
-
core.debug(`BuildKit.versionSatisfies ${node}: ${range}`);
|
|
123
110
|
let bkversion = node.buildkitVersion;
|
|
111
|
+
core.debug(`BuildKit.versionSatisfies ${bkversion}: ${range}`);
|
|
124
112
|
if (!bkversion) {
|
|
125
113
|
try {
|
|
126
114
|
bkversion = yield this.getVersionWithinImage(node.name || '');
|
|
127
115
|
}
|
|
128
116
|
catch (e) {
|
|
129
|
-
core.debug(`BuildKit.versionSatisfies ${node}: can't get version`);
|
|
117
|
+
core.debug(`BuildKit.versionSatisfies ${node.name}: can't get version`);
|
|
130
118
|
return false;
|
|
131
119
|
}
|
|
132
120
|
}
|
|
133
|
-
core.debug(`BuildKit.versionSatisfies ${node}: version ${bkversion}`);
|
|
121
|
+
core.debug(`BuildKit.versionSatisfies ${node.name}: version ${bkversion}`);
|
|
134
122
|
// BuildKit version reported by moby is in the format of `v0.11.0-moby`
|
|
135
123
|
if (builderInfo.driver == 'docker' && !bkversion.endsWith('-moby')) {
|
|
136
124
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildkit.js","sourceRoot":"","sources":["../../src/buildkit/buildkit.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,oDAAsC;AACtC
|
|
1
|
+
{"version":3,"file":"buildkit.js","sourceRoot":"","sources":["../../src/buildkit/buildkit.ts"],"names":[],"mappings":"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"}
|
package/lib/buildkit/config.d.ts
CHANGED
|
@@ -13,10 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Context } from '../context';
|
|
17
16
|
export declare class Config {
|
|
18
|
-
private readonly context;
|
|
19
|
-
constructor(context: Context);
|
|
20
17
|
resolveFromString(s: string): string;
|
|
21
18
|
resolveFromFile(s: string): string;
|
|
22
19
|
private resolve;
|
package/lib/buildkit/config.js
CHANGED
|
@@ -20,10 +20,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
20
20
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
21
|
exports.Config = void 0;
|
|
22
22
|
const fs_1 = __importDefault(require("fs"));
|
|
23
|
+
const context_1 = require("../context");
|
|
23
24
|
class Config {
|
|
24
|
-
constructor(context) {
|
|
25
|
-
this.context = context;
|
|
26
|
-
}
|
|
27
25
|
resolveFromString(s) {
|
|
28
26
|
return this.resolve(s, false);
|
|
29
27
|
}
|
|
@@ -37,7 +35,7 @@ class Config {
|
|
|
37
35
|
}
|
|
38
36
|
s = fs_1.default.readFileSync(s, { encoding: 'utf-8' });
|
|
39
37
|
}
|
|
40
|
-
const configFile =
|
|
38
|
+
const configFile = context_1.Context.tmpName({ tmpdir: context_1.Context.tmpDir() });
|
|
41
39
|
fs_1.default.writeFileSync(configFile, s);
|
|
42
40
|
return configFile;
|
|
43
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/buildkit/config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;AAEH,4CAAoB;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/buildkit/config.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;AAEH,4CAAoB;AAEpB,wCAAmC;AAEnC,MAAa,MAAM;IACV,iBAAiB,CAAC,CAAS;QAChC,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IAEM,eAAe,CAAC,CAAS;QAC9B,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC/B,CAAC;IAEO,OAAO,CAAC,CAAS,EAAE,IAAa;QACtC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;aAC/C;YACD,CAAC,GAAG,YAAE,CAAC,YAAY,CAAC,CAAC,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,CAAC;SAC7C;QACD,MAAM,UAAU,GAAG,iBAAO,CAAC,OAAO,CAAC,EAAC,MAAM,EAAE,iBAAO,CAAC,MAAM,EAAE,EAAC,CAAC,CAAC;QAC/D,YAAE,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;QAChC,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AApBD,wBAoBC"}
|
package/lib/buildx/builder.d.ts
CHANGED
|
@@ -14,16 +14,13 @@
|
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
16
|
import { Buildx } from './buildx';
|
|
17
|
-
import { Context } from '../context';
|
|
18
17
|
import { BuilderInfo } from '../types/builder';
|
|
19
18
|
export interface BuilderOpts {
|
|
20
|
-
context: Context;
|
|
21
19
|
buildx?: Buildx;
|
|
22
20
|
}
|
|
23
21
|
export declare class Builder {
|
|
24
|
-
private readonly context;
|
|
25
22
|
private readonly buildx;
|
|
26
|
-
constructor(opts
|
|
23
|
+
constructor(opts?: BuilderOpts);
|
|
27
24
|
inspect(name: string): Promise<BuilderInfo>;
|
|
28
25
|
static parseInspect(data: string): BuilderInfo;
|
|
29
26
|
}
|
package/lib/buildx/builder.js
CHANGED
|
@@ -14,29 +14,6 @@
|
|
|
14
14
|
* See the License for the specific language governing permissions and
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
18
|
-
if (k2 === undefined) k2 = k;
|
|
19
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
20
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
21
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
22
|
-
}
|
|
23
|
-
Object.defineProperty(o, k2, desc);
|
|
24
|
-
}) : (function(o, m, k, k2) {
|
|
25
|
-
if (k2 === undefined) k2 = k;
|
|
26
|
-
o[k2] = m[k];
|
|
27
|
-
}));
|
|
28
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
29
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
30
|
-
}) : function(o, v) {
|
|
31
|
-
o["default"] = v;
|
|
32
|
-
});
|
|
33
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
34
|
-
if (mod && mod.__esModule) return mod;
|
|
35
|
-
var result = {};
|
|
36
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
37
|
-
__setModuleDefault(result, mod);
|
|
38
|
-
return result;
|
|
39
|
-
};
|
|
40
17
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
41
18
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
42
19
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -48,26 +25,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
48
25
|
};
|
|
49
26
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
50
27
|
exports.Builder = void 0;
|
|
51
|
-
const exec = __importStar(require("@actions/exec"));
|
|
52
28
|
const buildx_1 = require("./buildx");
|
|
29
|
+
const exec_1 = require("../exec");
|
|
53
30
|
class Builder {
|
|
54
31
|
constructor(opts) {
|
|
55
|
-
this.
|
|
56
|
-
this.buildx =
|
|
57
|
-
(opts === null || opts === void 0 ? void 0 : opts.buildx) ||
|
|
58
|
-
new buildx_1.Buildx({
|
|
59
|
-
context: this.context
|
|
60
|
-
});
|
|
32
|
+
this.buildx = (opts === null || opts === void 0 ? void 0 : opts.buildx) || new buildx_1.Buildx();
|
|
61
33
|
}
|
|
62
34
|
inspect(name) {
|
|
63
35
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
36
|
const cmd = yield this.buildx.getCommand(['inspect', name]);
|
|
65
|
-
return yield
|
|
66
|
-
.getExecOutput(cmd.command, cmd.args, {
|
|
37
|
+
return yield exec_1.Exec.getExecOutput(cmd.command, cmd.args, {
|
|
67
38
|
ignoreReturnCode: true,
|
|
68
39
|
silent: true
|
|
69
|
-
})
|
|
70
|
-
.then(res => {
|
|
40
|
+
}).then(res => {
|
|
71
41
|
if (res.stderr.length > 0 && res.exitCode != 0) {
|
|
72
42
|
throw new Error(res.stderr.trim());
|
|
73
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/buildx/builder.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG
|
|
1
|
+
{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/buildx/builder.ts"],"names":[],"mappings":"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"}
|
package/lib/buildx/buildx.d.ts
CHANGED
|
@@ -13,20 +13,18 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Context } from '../context';
|
|
17
16
|
import { Inputs } from './inputs';
|
|
18
17
|
import { Cert } from '../types/buildx';
|
|
19
18
|
export interface BuildxOpts {
|
|
20
|
-
context: Context;
|
|
21
19
|
standalone?: boolean;
|
|
22
20
|
}
|
|
23
21
|
export declare class Buildx {
|
|
24
22
|
private _version;
|
|
23
|
+
private _versionOnce;
|
|
25
24
|
private readonly _standalone;
|
|
26
|
-
private readonly context;
|
|
27
25
|
readonly inputs: Inputs;
|
|
28
26
|
static readonly containerNamePrefix = "buildx_buildkit_";
|
|
29
|
-
constructor(opts
|
|
27
|
+
constructor(opts?: BuildxOpts);
|
|
30
28
|
static get configDir(): string;
|
|
31
29
|
static get certsDir(): string;
|
|
32
30
|
isStandalone(): Promise<boolean>;
|
|
@@ -36,7 +34,7 @@ export declare class Buildx {
|
|
|
36
34
|
}>;
|
|
37
35
|
isAvailable(): Promise<boolean>;
|
|
38
36
|
printInspect(name: string): Promise<void>;
|
|
39
|
-
|
|
37
|
+
version(): Promise<string>;
|
|
40
38
|
printVersion(): Promise<void>;
|
|
41
39
|
static parseVersion(stdout: string): string;
|
|
42
40
|
versionSatisfies(range: string, version?: string): Promise<boolean>;
|
package/lib/buildx/buildx.js
CHANGED
|
@@ -54,15 +54,16 @@ exports.Buildx = void 0;
|
|
|
54
54
|
const fs_1 = __importDefault(require("fs"));
|
|
55
55
|
const path_1 = __importDefault(require("path"));
|
|
56
56
|
const core = __importStar(require("@actions/core"));
|
|
57
|
-
const exec = __importStar(require("@actions/exec"));
|
|
58
57
|
const semver = __importStar(require("semver"));
|
|
59
58
|
const docker_1 = require("../docker");
|
|
59
|
+
const exec_1 = require("../exec");
|
|
60
60
|
const inputs_1 = require("./inputs");
|
|
61
61
|
class Buildx {
|
|
62
62
|
constructor(opts) {
|
|
63
63
|
this._standalone = opts === null || opts === void 0 ? void 0 : opts.standalone;
|
|
64
|
-
this.
|
|
65
|
-
this.
|
|
64
|
+
this._version = '';
|
|
65
|
+
this._versionOnce = false;
|
|
66
|
+
this.inputs = new inputs_1.Inputs();
|
|
66
67
|
}
|
|
67
68
|
static get configDir() {
|
|
68
69
|
return process.env.BUILDX_CONFIG || path_1.default.join(docker_1.Docker.configDir, 'buildx');
|
|
@@ -73,7 +74,7 @@ class Buildx {
|
|
|
73
74
|
isStandalone() {
|
|
74
75
|
var _a;
|
|
75
76
|
return __awaiter(this, void 0, void 0, function* () {
|
|
76
|
-
const standalone = (_a = this._standalone) !== null && _a !== void 0 ? _a : !(yield docker_1.Docker.
|
|
77
|
+
const standalone = (_a = this._standalone) !== null && _a !== void 0 ? _a : !(yield docker_1.Docker.isAvailable());
|
|
77
78
|
core.debug(`Buildx.isStandalone: ${standalone}`);
|
|
78
79
|
return standalone;
|
|
79
80
|
});
|
|
@@ -90,54 +91,56 @@ class Buildx {
|
|
|
90
91
|
isAvailable() {
|
|
91
92
|
return __awaiter(this, void 0, void 0, function* () {
|
|
92
93
|
const cmd = yield this.getCommand([]);
|
|
93
|
-
|
|
94
|
-
.getExecOutput(cmd.command, cmd.args, {
|
|
94
|
+
const ok = yield exec_1.Exec.getExecOutput(cmd.command, cmd.args, {
|
|
95
95
|
ignoreReturnCode: true,
|
|
96
96
|
silent: true
|
|
97
97
|
})
|
|
98
98
|
.then(res => {
|
|
99
99
|
if (res.stderr.length > 0 && res.exitCode != 0) {
|
|
100
|
+
core.debug(`Buildx.isAvailable cmd err: ${res.stderr}`);
|
|
100
101
|
return false;
|
|
101
102
|
}
|
|
102
103
|
return res.exitCode == 0;
|
|
103
104
|
})
|
|
104
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
105
105
|
.catch(error => {
|
|
106
|
+
core.debug(`Buildx.isAvailable error: ${error}`);
|
|
106
107
|
return false;
|
|
107
108
|
});
|
|
109
|
+
core.debug(`Buildx.isAvailable: ${ok}`);
|
|
110
|
+
return ok;
|
|
108
111
|
});
|
|
109
112
|
}
|
|
110
113
|
printInspect(name) {
|
|
111
114
|
return __awaiter(this, void 0, void 0, function* () {
|
|
112
115
|
const cmd = yield this.getCommand(['inspect', name]);
|
|
113
|
-
yield
|
|
116
|
+
yield exec_1.Exec.exec(cmd.command, cmd.args, {
|
|
114
117
|
failOnStdErr: false
|
|
115
118
|
});
|
|
116
119
|
});
|
|
117
120
|
}
|
|
118
|
-
|
|
119
|
-
return
|
|
120
|
-
if (
|
|
121
|
-
|
|
122
|
-
this._version = yield exec
|
|
123
|
-
.getExecOutput(cmd.command, cmd.args, {
|
|
124
|
-
ignoreReturnCode: true,
|
|
125
|
-
silent: true
|
|
126
|
-
})
|
|
127
|
-
.then(res => {
|
|
128
|
-
if (res.stderr.length > 0 && res.exitCode != 0) {
|
|
129
|
-
throw new Error(res.stderr.trim());
|
|
130
|
-
}
|
|
131
|
-
return Buildx.parseVersion(res.stdout.trim());
|
|
132
|
-
});
|
|
121
|
+
version() {
|
|
122
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
123
|
+
if (this._versionOnce) {
|
|
124
|
+
return this._version;
|
|
133
125
|
}
|
|
126
|
+
this._versionOnce = true;
|
|
127
|
+
const cmd = yield this.getCommand(['version']);
|
|
128
|
+
this._version = yield exec_1.Exec.getExecOutput(cmd.command, cmd.args, {
|
|
129
|
+
ignoreReturnCode: true,
|
|
130
|
+
silent: true
|
|
131
|
+
}).then(res => {
|
|
132
|
+
if (res.stderr.length > 0 && res.exitCode != 0) {
|
|
133
|
+
throw new Error(res.stderr.trim());
|
|
134
|
+
}
|
|
135
|
+
return Buildx.parseVersion(res.stdout.trim());
|
|
136
|
+
});
|
|
134
137
|
return this._version;
|
|
135
|
-
})
|
|
138
|
+
});
|
|
136
139
|
}
|
|
137
140
|
printVersion() {
|
|
138
141
|
return __awaiter(this, void 0, void 0, function* () {
|
|
139
142
|
const cmd = yield this.getCommand(['version']);
|
|
140
|
-
yield
|
|
143
|
+
yield exec_1.Exec.exec(cmd.command, cmd.args, {
|
|
141
144
|
failOnStdErr: false
|
|
142
145
|
});
|
|
143
146
|
});
|
|
@@ -151,7 +154,7 @@ class Buildx {
|
|
|
151
154
|
}
|
|
152
155
|
versionSatisfies(range, version) {
|
|
153
156
|
return __awaiter(this, void 0, void 0, function* () {
|
|
154
|
-
const ver = version !== null && version !== void 0 ? version : (yield this.version);
|
|
157
|
+
const ver = version !== null && version !== void 0 ? version : (yield this.version());
|
|
155
158
|
if (!ver) {
|
|
156
159
|
core.debug(`Buildx.versionSatisfies false: undefined version`);
|
|
157
160
|
return false;
|
package/lib/buildx/buildx.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildx.js","sourceRoot":"","sources":["../../src/buildx/buildx.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4CAAoB;AACpB,gDAAwB;AACxB,oDAAsC;AACtC
|
|
1
|
+
{"version":3,"file":"buildx.js","sourceRoot":"","sources":["../../src/buildx/buildx.ts"],"names":[],"mappings":"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"}
|
package/lib/buildx/inputs.d.ts
CHANGED
|
@@ -13,10 +13,7 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Context } from '../context';
|
|
17
16
|
export declare class Inputs {
|
|
18
|
-
private readonly context;
|
|
19
|
-
constructor(context: Context);
|
|
20
17
|
getBuildImageIDFilePath(): string;
|
|
21
18
|
getBuildMetadataFilePath(): string;
|
|
22
19
|
resolveBuildImageID(): string | undefined;
|
package/lib/buildx/inputs.js
CHANGED
|
@@ -46,15 +46,13 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
46
46
|
const path_1 = __importDefault(require("path"));
|
|
47
47
|
const core = __importStar(require("@actions/core"));
|
|
48
48
|
const sync_1 = require("csv-parse/sync");
|
|
49
|
+
const context_1 = require("../context");
|
|
49
50
|
class Inputs {
|
|
50
|
-
constructor(context) {
|
|
51
|
-
this.context = context;
|
|
52
|
-
}
|
|
53
51
|
getBuildImageIDFilePath() {
|
|
54
|
-
return path_1.default.join(
|
|
52
|
+
return path_1.default.join(context_1.Context.tmpDir(), 'iidfile');
|
|
55
53
|
}
|
|
56
54
|
getBuildMetadataFilePath() {
|
|
57
|
-
return path_1.default.join(
|
|
55
|
+
return path_1.default.join(context_1.Context.tmpDir(), 'metadata-file');
|
|
58
56
|
}
|
|
59
57
|
resolveBuildImageID() {
|
|
60
58
|
const iidFile = this.getBuildImageIDFilePath();
|
|
@@ -104,7 +102,7 @@ class Inputs {
|
|
|
104
102
|
}
|
|
105
103
|
value = fs_1.default.readFileSync(value, { encoding: 'utf-8' });
|
|
106
104
|
}
|
|
107
|
-
const secretFile =
|
|
105
|
+
const secretFile = context_1.Context.tmpName({ tmpdir: context_1.Context.tmpDir() });
|
|
108
106
|
fs_1.default.writeFileSync(secretFile, value);
|
|
109
107
|
return `id=${key},src=${secretFile}`;
|
|
110
108
|
}
|
|
@@ -114,9 +112,8 @@ class Inputs {
|
|
|
114
112
|
// if input is not set returns empty string
|
|
115
113
|
return input;
|
|
116
114
|
}
|
|
117
|
-
const builderID = this.context.provenanceBuilderID;
|
|
118
115
|
try {
|
|
119
|
-
return core.getBooleanInput(name) ? `builder-id=${
|
|
116
|
+
return core.getBooleanInput(name) ? `builder-id=${context_1.Context.provenanceBuilderID()}` : 'false';
|
|
120
117
|
}
|
|
121
118
|
catch (err) {
|
|
122
119
|
// not a valid boolean, so we assume it's a string
|
|
@@ -125,7 +122,7 @@ class Inputs {
|
|
|
125
122
|
}
|
|
126
123
|
resolveProvenanceAttrs(input) {
|
|
127
124
|
if (!input) {
|
|
128
|
-
return `builder-id=${
|
|
125
|
+
return `builder-id=${context_1.Context.provenanceBuilderID()}`;
|
|
129
126
|
}
|
|
130
127
|
// parse attributes from input
|
|
131
128
|
const fields = (0, sync_1.parse)(input, {
|
|
@@ -143,7 +140,7 @@ class Inputs {
|
|
|
143
140
|
}
|
|
144
141
|
}
|
|
145
142
|
// if not add builder-id attribute
|
|
146
|
-
return `${input},builder-id=${
|
|
143
|
+
return `${input},builder-id=${context_1.Context.provenanceBuilderID()}`;
|
|
147
144
|
}
|
|
148
145
|
static hasLocalExporter(exporters) {
|
|
149
146
|
return Inputs.hasExporterType('local', exporters);
|
|
@@ -152,7 +149,7 @@ class Inputs {
|
|
|
152
149
|
return Inputs.hasExporterType('tar', exporters);
|
|
153
150
|
}
|
|
154
151
|
static hasDockerExporter(exporters, load) {
|
|
155
|
-
return load
|
|
152
|
+
return load || Inputs.hasExporterType('docker', exporters);
|
|
156
153
|
}
|
|
157
154
|
static hasExporterType(name, exporters) {
|
|
158
155
|
const records = (0, sync_1.parse)(exporters.join(`\n`), {
|
package/lib/buildx/inputs.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inputs.js","sourceRoot":"","sources":["../../src/buildx/inputs.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,4CAAoB;AACpB,gDAAwB;AACxB,oDAAsC;AACtC,yCAAqC;
|
|
1
|
+
{"version":3,"file":"inputs.js","sourceRoot":"","sources":["../../src/buildx/inputs.ts"],"names":[],"mappings":"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"}
|
package/lib/buildx/install.d.ts
CHANGED
|
@@ -13,22 +13,19 @@
|
|
|
13
13
|
* See the License for the specific language governing permissions and
|
|
14
14
|
* limitations under the License.
|
|
15
15
|
*/
|
|
16
|
-
import { Context } from '../context';
|
|
17
16
|
import { GitHubRelease } from '../types/github';
|
|
18
17
|
export interface InstallOpts {
|
|
19
|
-
context?: Context;
|
|
20
18
|
standalone?: boolean;
|
|
21
19
|
}
|
|
22
20
|
export declare class Install {
|
|
23
21
|
private readonly _standalone;
|
|
24
|
-
private readonly context;
|
|
25
22
|
constructor(opts?: InstallOpts);
|
|
26
|
-
download(version: string
|
|
27
|
-
build(gitContext: string
|
|
23
|
+
download(version: string): Promise<string>;
|
|
24
|
+
build(gitContext: string): Promise<string>;
|
|
25
|
+
installStandalone(toolPath: string, dest?: string): Promise<string>;
|
|
26
|
+
installPlugin(toolPath: string, dest?: string): Promise<string>;
|
|
28
27
|
private buildCommand;
|
|
29
28
|
private isStandalone;
|
|
30
|
-
private setStandalone;
|
|
31
|
-
private setPlugin;
|
|
32
29
|
private fetchBinary;
|
|
33
30
|
private platform;
|
|
34
31
|
private filename;
|