cdk8s-image 0.2.133 → 0.2.136
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/.jsii +22 -5
- package/API.md +2 -0
- package/changelog.md +1 -6
- package/lib/image.d.ts +4 -0
- package/lib/image.js +12 -8
- package/package.json +2 -2
- package/releasetag.txt +1 -1
- package/version.txt +1 -1
package/.jsii
CHANGED
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
},
|
|
168
168
|
"locationInModule": {
|
|
169
169
|
"filename": "src/image.ts",
|
|
170
|
-
"line":
|
|
170
|
+
"line": 69
|
|
171
171
|
},
|
|
172
172
|
"parameters": [
|
|
173
173
|
{
|
|
@@ -193,7 +193,7 @@
|
|
|
193
193
|
"kind": "class",
|
|
194
194
|
"locationInModule": {
|
|
195
195
|
"filename": "src/image.ts",
|
|
196
|
-
"line":
|
|
196
|
+
"line": 63
|
|
197
197
|
},
|
|
198
198
|
"name": "Image",
|
|
199
199
|
"properties": [
|
|
@@ -205,7 +205,7 @@
|
|
|
205
205
|
"immutable": true,
|
|
206
206
|
"locationInModule": {
|
|
207
207
|
"filename": "src/image.ts",
|
|
208
|
-
"line":
|
|
208
|
+
"line": 67
|
|
209
209
|
},
|
|
210
210
|
"name": "url",
|
|
211
211
|
"type": {
|
|
@@ -268,6 +268,23 @@
|
|
|
268
268
|
}
|
|
269
269
|
}
|
|
270
270
|
},
|
|
271
|
+
{
|
|
272
|
+
"abstract": true,
|
|
273
|
+
"docs": {
|
|
274
|
+
"stability": "stable",
|
|
275
|
+
"summary": "Path to Dockerfile."
|
|
276
|
+
},
|
|
277
|
+
"immutable": true,
|
|
278
|
+
"locationInModule": {
|
|
279
|
+
"filename": "src/image.ts",
|
|
280
|
+
"line": 50
|
|
281
|
+
},
|
|
282
|
+
"name": "file",
|
|
283
|
+
"optional": true,
|
|
284
|
+
"type": {
|
|
285
|
+
"primitive": "string"
|
|
286
|
+
}
|
|
287
|
+
},
|
|
271
288
|
{
|
|
272
289
|
"abstract": true,
|
|
273
290
|
"docs": {
|
|
@@ -291,6 +308,6 @@
|
|
|
291
308
|
"symbolId": "src/image:ImageProps"
|
|
292
309
|
}
|
|
293
310
|
},
|
|
294
|
-
"version": "0.2.
|
|
295
|
-
"fingerprint": "
|
|
311
|
+
"version": "0.2.136",
|
|
312
|
+
"fingerprint": "sJAOsID2at6K3PzYJex68dTpD4oifvRIJKAJrg+N7lE="
|
|
296
313
|
}
|
package/API.md
CHANGED
|
@@ -43,6 +43,7 @@ new Image(scope: Construct, id: string, props: ImageProps)
|
|
|
43
43
|
* **props** (<code>[ImageProps](#cdk8s-image-imageprops)</code>) *No description*
|
|
44
44
|
* **dir** (<code>string</code>) The docker build context directory (where `Dockerfile` is).
|
|
45
45
|
* **buildArgs** (<code>Array<[BuildArg](#cdk8s-image-buildarg)></code>) List of build args to pass to the build action. __*Optional*__
|
|
46
|
+
* **file** (<code>string</code>) Path to Dockerfile. __*Optional*__
|
|
46
47
|
* **registry** (<code>string</code>) The registry URL to use. __*Default*__: "docker.io/library"
|
|
47
48
|
|
|
48
49
|
|
|
@@ -81,6 +82,7 @@ Name | Type | Description
|
|
|
81
82
|
-----|------|-------------
|
|
82
83
|
**dir** | <code>string</code> | The docker build context directory (where `Dockerfile` is).
|
|
83
84
|
**buildArgs**? | <code>Array<[BuildArg](#cdk8s-image-buildarg)></code> | List of build args to pass to the build action.<br/>__*Optional*__
|
|
85
|
+
**file**? | <code>string</code> | Path to Dockerfile.<br/>__*Optional*__
|
|
84
86
|
**registry**? | <code>string</code> | The registry URL to use.<br/>__*Default*__: "docker.io/library"
|
|
85
87
|
|
|
86
88
|
|
package/changelog.md
CHANGED
|
@@ -1,7 +1,2 @@
|
|
|
1
1
|
|
|
2
|
-
### [0.2.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
### Bug Fixes
|
|
6
|
-
|
|
7
|
-
* --build-arg to correct format ([#535](https://github.com/cdk8s-team/cdk8s-image/issues/535)) ([6f01183](https://github.com/cdk8s-team/cdk8s-image/commit/6f01183dea9366f1d1966511ab3e7e4a432d7e08))
|
|
2
|
+
### [0.2.136](https://github.com/cdk8s-team/cdk8s-image/compare/v0.2.135...v0.2.136) (2022-05-05)
|
package/lib/image.d.ts
CHANGED
|
@@ -34,6 +34,10 @@ export interface ImageProps {
|
|
|
34
34
|
* List of build args to pass to the build action
|
|
35
35
|
*/
|
|
36
36
|
readonly buildArgs?: BuildArg[];
|
|
37
|
+
/**
|
|
38
|
+
* Path to Dockerfile
|
|
39
|
+
*/
|
|
40
|
+
readonly file?: string;
|
|
37
41
|
}
|
|
38
42
|
/**
|
|
39
43
|
* Represents a docker image built during synthesis from a context directory
|
package/lib/image.js
CHANGED
|
@@ -23,14 +23,18 @@ class Image extends constructs_1.Construct {
|
|
|
23
23
|
super(scope, id);
|
|
24
24
|
const registry = (_b = props.registry) !== null && _b !== void 0 ? _b : 'docker.io/library';
|
|
25
25
|
const tag = `${registry}/${cdk8s_1.Names.toDnsLabel(this)}`;
|
|
26
|
-
const
|
|
26
|
+
const allBuildArgs = [];
|
|
27
27
|
(_c = props.buildArgs) === null || _c === void 0 ? void 0 : _c.forEach((arg) => {
|
|
28
|
-
|
|
29
|
-
|
|
28
|
+
allBuildArgs.push('--build-arg');
|
|
29
|
+
allBuildArgs.push(`${arg.name}=${arg.value}`);
|
|
30
30
|
});
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
if (props.file) {
|
|
32
|
+
allBuildArgs.push('-f');
|
|
33
|
+
allBuildArgs.push(props.file);
|
|
34
|
+
}
|
|
35
|
+
console.error(`building docker image ${tag} from ${props.file ? props.file : props.dir}`);
|
|
36
|
+
_shell_1.shell('docker', 'build', '-t', tag, props.dir, ...allBuildArgs);
|
|
37
|
+
console.error(`pushing docker image ${tag} to ${registry}`);
|
|
34
38
|
const push = _shell_1.shell('docker', 'push', tag);
|
|
35
39
|
const result = PARSE_DIGEST.exec(push);
|
|
36
40
|
if (!result) {
|
|
@@ -41,5 +45,5 @@ class Image extends constructs_1.Construct {
|
|
|
41
45
|
}
|
|
42
46
|
exports.Image = Image;
|
|
43
47
|
_a = JSII_RTTI_SYMBOL_1;
|
|
44
|
-
Image[_a] = { fqn: "cdk8s-image.Image", version: "0.2.
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
Image[_a] = { fqn: "cdk8s-image.Image", version: "0.2.136" };
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW1hZ2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW1hZ2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSxpQ0FBOEI7QUFDOUIsMkNBQXVDO0FBQ3ZDLHFDQUFpQztBQUVqQyxNQUFNLFlBQVksR0FBRyw2QkFBNkIsQ0FBQztBQWdEbkQ7Ozs7Ozs7OztHQVNHO0FBQ0gsTUFBYSxLQUFNLFNBQVEsc0JBQVM7SUFNbEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFpQjs7UUFDekQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUNqQixNQUFNLFFBQVEsU0FBRyxLQUFLLENBQUMsUUFBUSxtQ0FBSSxtQkFBbUIsQ0FBQztRQUN2RCxNQUFNLEdBQUcsR0FBRyxHQUFHLFFBQVEsSUFBSSxhQUFLLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUM7UUFDcEQsTUFBTSxZQUFZLEdBQWEsRUFBRSxDQUFDO1FBQ2xDLE1BQUEsS0FBSyxDQUFDLFNBQVMsMENBQUUsT0FBTyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUU7WUFDL0IsWUFBWSxDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQztZQUNqQyxZQUFZLENBQUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLElBQUksSUFBSSxHQUFHLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQztRQUNoRCxDQUFDLEVBQUU7UUFDSCxJQUFJLEtBQUssQ0FBQyxJQUFJLEVBQUU7WUFDZCxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ3hCLFlBQVksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxDQUFDO1NBQy9CO1FBQ0QsT0FBTyxDQUFDLEtBQUssQ0FBQyx5QkFBeUIsR0FBRyxTQUFTLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1FBQzFGLGNBQUssQ0FBQyxRQUFRLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsS0FBSyxDQUFDLEdBQUcsRUFBRSxHQUFHLFlBQVksQ0FBQyxDQUFDO1FBQ2hFLE9BQU8sQ0FBQyxLQUFLLENBQUMsd0JBQXdCLEdBQUcsT0FBTyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1FBQzVELE1BQU0sSUFBSSxHQUFHLGNBQUssQ0FBQyxRQUFRLEVBQUUsTUFBTSxFQUFFLEdBQUcsQ0FBQyxDQUFDO1FBRTFDLE1BQU0sTUFBTSxHQUFHLFlBQVksQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDdkMsSUFBSSxDQUFDLE1BQU0sRUFBRTtZQUNYLE1BQU0sSUFBSSxLQUFLLENBQUMsMkNBQTJDLElBQUksRUFBRSxDQUFDLENBQUM7U0FDcEU7UUFFRCxJQUFJLENBQUMsR0FBRyxHQUFHLEdBQUcsR0FBRyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO0lBQ25DLENBQUM7O0FBOUJILHNCQStCQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IE5hbWVzIH0gZnJvbSAnY2RrOHMnO1xuaW1wb3J0IHsgQ29uc3RydWN0IH0gZnJvbSAnY29uc3RydWN0cyc7XG5pbXBvcnQgeyBzaGVsbCB9IGZyb20gJy4vX3NoZWxsJztcblxuY29uc3QgUEFSU0VfRElHRVNUID0gL2RpZ2VzdDpcXCAoc2hhMjU2OlswLTlhLWZdKykvO1xuXG4vKipcbiAqIEJ1aWxkIGFyZyB0byBwYXNzIHRvIHRoZSBkb2NrZXIgYnVpbGRcbiAqL1xuZXhwb3J0IGludGVyZmFjZSBCdWlsZEFyZyB7XG4gIC8qKlxuICAgKiB0aGUgbmFtZSBvZiB0aGUgYnVpbGQgYXJnXG4gICAqL1xuICByZWFkb25seSBuYW1lOiBzdHJpbmc7XG5cbiAgLyoqXG4gICAqIHRoZSB2YWx1ZSBvZiB0aGUgYnVpbGQgYXJnXG4gICAqL1xuICByZWFkb25seSB2YWx1ZTogc3RyaW5nO1xufVxuXG4vKipcbiAqIFByb3BzIGZvciBgSW1hZ2VgLlxuICovXG5leHBvcnQgaW50ZXJmYWNlIEltYWdlUHJvcHMge1xuICAvKipcbiAgICogVGhlIGRvY2tlciBidWlsZCBjb250ZXh0IGRpcmVjdG9yeSAod2hlcmUgYERvY2tlcmZpbGVgIGlzKS5cbiAgICovXG4gIHJlYWRvbmx5IGRpcjogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBUaGUgcmVnaXN0cnkgVVJMIHRvIHVzZS5cbiAgICpcbiAgICogVGhpcyB3aWxsIGJlIHVzZWQgYXMgdGhlIHByZWZpeCBmb3IgdGhlIGltYWdlIG5hbWUuXG4gICAqXG4gICAqIEZvciBleGFtcGxlLCBpZiB5b3UgaGF2ZSBhIGxvY2FsIHJlZ2lzdHJ5IGxpc3RlbmluZyBvbiBwb3J0IDUwMCwgeW91IGNhbiBzZXQgdGhpcyB0byBgbG9jYWxob3N0OjUwMDBgLlxuICAgKlxuICAgKiBAZGVmYXVsdCBcImRvY2tlci5pby9saWJyYXJ5XCJcbiAgICovXG4gIHJlYWRvbmx5IHJlZ2lzdHJ5Pzogc3RyaW5nO1xuXG4gIC8qKlxuICAgKiBMaXN0IG9mIGJ1aWxkIGFyZ3MgdG8gcGFzcyB0byB0aGUgYnVpbGQgYWN0aW9uXG4gICAqL1xuICByZWFkb25seSBidWlsZEFyZ3M/OiBCdWlsZEFyZ1tdO1xuXG4gIC8qKlxuICAgKiBQYXRoIHRvIERvY2tlcmZpbGVcbiAgICovXG4gIHJlYWRvbmx5IGZpbGU/OiBzdHJpbmc7XG59XG5cbi8qKlxuICogUmVwcmVzZW50cyBhIGRvY2tlciBpbWFnZSBidWlsdCBkdXJpbmcgc3ludGhlc2lzIGZyb20gYSBjb250ZXh0IGRpcmVjdG9yeVxuICogKGBkaXJgKSB3aXRoIGEgYERvY2tlcmZpbGVgLlxuICpcbiAqIFRoZSBpbWFnZSB3aWxsIGJlIGJ1aWx0IHVzaW5nIGBkb2NrZXIgYnVpbGRgIGFuZCB0aGVuIHB1c2hlZCB0aHJvdWdoIGBkb2NrZXJcbiAqIHB1c2hgLiBUaGUgVVJMIG9mIHRoZSBwdXNoZWQgaW1hZ2UgY2FuIGJlIGFjY2Vzc2VkIHRocm91Z2ggYGltYWdlLnVybGAuXG4gKlxuICogSWYgeW91IHB1c2ggdG8gYSByZWdpc3RyeSBvdGhlciB0aGVuIGRvY2tlciBodWIsIHlvdSBjYW4gc3BlY2lmeSB0aGUgcmVnaXN0cnlcbiAqIFVSTCB0aHJvdWdoIHRoZSBgcmVnaXN0cnlgIG9wdGlvbi5cbiAqL1xuZXhwb3J0IGNsYXNzIEltYWdlIGV4dGVuZHMgQ29uc3RydWN0IHtcbiAgLyoqXG4gICAqIFRoZSBpbWFnZSBVUkwgdG8gdXNlIGluIG9yZGVyIHRvIHB1bGwgdGhpcyBpbnN0YW5jZSBvZiB0aGUgaW1hZ2UuXG4gICAqL1xuICBwdWJsaWMgcmVhZG9ubHkgdXJsOiBzdHJpbmc7XG5cbiAgY29uc3RydWN0b3Ioc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM6IEltYWdlUHJvcHMpIHtcbiAgICBzdXBlcihzY29wZSwgaWQpO1xuICAgIGNvbnN0IHJlZ2lzdHJ5ID0gcHJvcHMucmVnaXN0cnkgPz8gJ2RvY2tlci5pby9saWJyYXJ5JztcbiAgICBjb25zdCB0YWcgPSBgJHtyZWdpc3RyeX0vJHtOYW1lcy50b0Ruc0xhYmVsKHRoaXMpfWA7XG4gICAgY29uc3QgYWxsQnVpbGRBcmdzOiBzdHJpbmdbXSA9IFtdO1xuICAgIHByb3BzLmJ1aWxkQXJncz8uZm9yRWFjaCgoYXJnKSA9PiB7XG4gICAgICBhbGxCdWlsZEFyZ3MucHVzaCgnLS1idWlsZC1hcmcnKTtcbiAgICAgIGFsbEJ1aWxkQXJncy5wdXNoKGAke2FyZy5uYW1lfT0ke2FyZy52YWx1ZX1gKTtcbiAgICB9KTtcbiAgICBpZiAocHJvcHMuZmlsZSkge1xuICAgICAgYWxsQnVpbGRBcmdzLnB1c2goJy1mJyk7XG4gICAgICBhbGxCdWlsZEFyZ3MucHVzaChwcm9wcy5maWxlKTtcbiAgICB9XG4gICAgY29uc29sZS5lcnJvcihgYnVpbGRpbmcgZG9ja2VyIGltYWdlICR7dGFnfSBmcm9tICR7cHJvcHMuZmlsZSA/IHByb3BzLmZpbGUgOiBwcm9wcy5kaXJ9YCk7XG4gICAgc2hlbGwoJ2RvY2tlcicsICdidWlsZCcsICctdCcsIHRhZywgcHJvcHMuZGlyLCAuLi5hbGxCdWlsZEFyZ3MpO1xuICAgIGNvbnNvbGUuZXJyb3IoYHB1c2hpbmcgZG9ja2VyIGltYWdlICR7dGFnfSB0byAke3JlZ2lzdHJ5fWApO1xuICAgIGNvbnN0IHB1c2ggPSBzaGVsbCgnZG9ja2VyJywgJ3B1c2gnLCB0YWcpO1xuXG4gICAgY29uc3QgcmVzdWx0ID0gUEFSU0VfRElHRVNULmV4ZWMocHVzaCk7XG4gICAgaWYgKCFyZXN1bHQpIHtcbiAgICAgIHRocm93IG5ldyBFcnJvcihgdW5hYmxlIHRvIHJlYWQgaW1hZ2UgZGlnZXN0IGFmdGVyIHB1c2g6ICR7cHVzaH1gKTtcbiAgICB9XG5cbiAgICB0aGlzLnVybCA9IGAke3RhZ31AJHtyZXN1bHRbMV19YDtcbiAgfVxufVxuIl19
|
package/package.json
CHANGED
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"jsii-pacmak": "^1.57.0",
|
|
56
56
|
"json-schema": "^0.4.0",
|
|
57
57
|
"npm-check-updates": "^12",
|
|
58
|
-
"projen": "^0.55.
|
|
58
|
+
"projen": "^0.55.6",
|
|
59
59
|
"standard-version": "^9",
|
|
60
60
|
"ts-jest": "^27",
|
|
61
61
|
"typescript": "^3.9.10"
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
},
|
|
76
76
|
"main": "lib/index.js",
|
|
77
77
|
"license": "Apache-2.0",
|
|
78
|
-
"version": "0.2.
|
|
78
|
+
"version": "0.2.136",
|
|
79
79
|
"jest": {
|
|
80
80
|
"testMatch": [
|
|
81
81
|
"<rootDir>/src/**/__tests__/**/*.ts?(x)",
|
package/releasetag.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
v0.2.
|
|
1
|
+
v0.2.136
|
package/version.txt
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.2.
|
|
1
|
+
0.2.136
|