@payfit/nx-core 4.57.2 → 4.57.4-ephemeral-opt-out-docker-ecr-cache.0
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/dist/src/executors/docker-build/executor.js +1 -1
- package/dist/src/executors/docker-build/executor.js.map +1 -1
- package/dist/src/executors/docker-build/schema.json +5 -0
- package/dist/src/executors/publisher/docker.js +1 -1
- package/dist/src/executors/publisher/docker.js.map +1 -1
- package/dist/src/executors/publisher/schema.json +5 -0
- package/dist/src/index.js +6 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/scripts/version-actions.mock.js +3 -0
- package/dist/src/scripts/version-actions.mock.js.map +1 -1
- package/dist/src/utils/common/nx.js +5 -1
- package/dist/src/utils/common/nx.js.map +1 -1
- package/dist/src/utils/docker.d.ts +2 -1
- package/dist/src/utils/docker.js +8 -5
- package/dist/src/utils/docker.js.map +1 -1
- package/dist/src/utils/spacelift/lib/__generated__/graphql.d.ts +2 -2
- package/dist/src/utils/spacelift/lib/__generated__/graphql.js +1 -1
- package/package.json +3 -3
|
@@ -34,7 +34,7 @@ const runExecutor = async (options, context) => {
|
|
|
34
34
|
await (0, ecr_1.ensureEcrAuth)(registry.name, options.isPublicRepository);
|
|
35
35
|
// Build ephemeral sha tag (immutable)
|
|
36
36
|
logger_1.consola.box(`Building and pushing ephemeral image to ${registry.url}/${options.ecrRepository}:${tag}`);
|
|
37
|
-
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [], context.projectName);
|
|
37
|
+
await (0, docker_1.buildAndPushDockerImage)(options.ecrRepository, projectDockerfile, tag, sanitizedRepoUrl, commitSha, registry.url, [], context.projectName, options.disableEcrCaching);
|
|
38
38
|
return { success: true };
|
|
39
39
|
};
|
|
40
40
|
exports.default = runExecutor;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/docker-build/executor.ts"],"names":[],"mappings":";;AAAA,8BAA6B;AAI7B,gDAAmE;AACnE,sDAGkC;AAClC,sDAAmD;AACnD,+CAA4D;AAG5D,MAAM,WAAW,GAGyB,KAAK,EAC7C,OAAmC,EACnC,OAAwB,EACxB,EAAE;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,YAAY,CAAC,CAAA;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,gBAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,kBAAkB;YAC7B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;QAChC,IAAI,EAAE,OAAO,CAAC,kBAAkB;YAC9B,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;KACjC,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IAC9D,MAAM,GAAG,GAAG,iBAAiB,SAAS,EAAE,CAAA;IAExC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,gBAAO,CAAC,GAAG,CACT,gDAAgD,iBAAiB,gBAAgB,OAAO,CAAC,aAAa,aAAa,GAAG,2BAA2B,CAClJ,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAE9D,sCAAsC;IACtC,gBAAO,CAAC,GAAG,CACT,2CAA2C,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,aAAa,IAAI,GAAG,EAAE,CAC1F,CAAA;IAED,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,aAAa,EACrB,iBAAiB,EACjB,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,EAAE,EACF,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../../src/executors/docker-build/executor.ts"],"names":[],"mappings":";;AAAA,8BAA6B;AAI7B,gDAAmE;AACnE,sDAGkC;AAClC,sDAAmD;AACnD,+CAA4D;AAG5D,MAAM,WAAW,GAGyB,KAAK,EAC7C,OAAmC,EACnC,OAAwB,EACxB,EAAE;IACF,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7E,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,YAAY,CAAC,CAAA;QACtE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;QAC3B,gBAAO,CAAC,KAAK,CACX,qGAAqG,CACtG,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,kBAAkB;YAC7B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;QAChC,IAAI,EAAE,OAAO,CAAC,kBAAkB;YAC9B,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;KACjC,CAAA;IAED,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IAC9D,MAAM,GAAG,GAAG,iBAAiB,SAAS,EAAE,CAAA;IAExC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,gBAAO,CAAC,GAAG,CACT,gDAAgD,iBAAiB,gBAAgB,OAAO,CAAC,aAAa,aAAa,GAAG,2BAA2B,CAClJ,CAAA;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;IAC1B,CAAC;IAED,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAA;IAE9D,sCAAsC;IACtC,gBAAO,CAAC,GAAG,CACT,2CAA2C,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,aAAa,IAAI,GAAG,EAAE,CAC1F,CAAA;IAED,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,aAAa,EACrB,iBAAiB,EACjB,GAAG,EACH,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,EAAE,EACF,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,iBAAiB,CAC1B,CAAA;IAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAA;AAC1B,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
|
|
@@ -18,6 +18,11 @@
|
|
|
18
18
|
"type": "boolean",
|
|
19
19
|
"description": "Do not build/push, only print what would happen",
|
|
20
20
|
"default": false
|
|
21
|
+
},
|
|
22
|
+
"disableEcrCaching": {
|
|
23
|
+
"type": "boolean",
|
|
24
|
+
"description": "Disable ECR caching",
|
|
25
|
+
"default": false
|
|
21
26
|
}
|
|
22
27
|
},
|
|
23
28
|
"required": ["ecrRepository"]
|
|
@@ -49,7 +49,7 @@ async function publishDocker(options, context, version, projectRoot, isDryRun =
|
|
|
49
49
|
}
|
|
50
50
|
else {
|
|
51
51
|
logger_1.consola.start('Building and pushing docker image from scratch');
|
|
52
|
-
await (0, docker_1.buildAndPushDockerImage)(options.ecrRegistry, projectDockerfile, version, sanitizedRepoUrl, commitSha, registry.url, extraTags, appName);
|
|
52
|
+
await (0, docker_1.buildAndPushDockerImage)(options.ecrRegistry, projectDockerfile, version, sanitizedRepoUrl, commitSha, registry.url, extraTags, appName, options.disableEcrCaching);
|
|
53
53
|
logger_1.consola.success('Docker image built and pushed successfully!');
|
|
54
54
|
}
|
|
55
55
|
if (!version.includes('ephemeral')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAmBA,
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../../src/executors/publisher/docker.ts"],"names":[],"mappings":";;AAmBA,sCAmGC;AAtHD,8BAA6B;AAI7B,gDAK+B;AAC/B,sDAGkC;AAClC,sDAAmD;AACnD,iDAA8D;AAC9D,+CAA4D;AAGrD,KAAK,UAAU,aAAa,CACjC,OAAiC,EACjC,OAAwB,EACxB,OAAe,EACf,WAAmB,EACnB,QAAQ,GAAG,KAAK;IAEhB,MAAM,iBAAiB,GAAG,GAAG,WAAW,aAAa,CAAA;IAErD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,gBAAO,CAAC,IAAI,CAAC,2BAA2B,iBAAiB,YAAY,CAAC,CAAA;QACtE,OAAM;IACR,CAAC;IACD,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACzB,gBAAO,CAAC,KAAK,CACX,mGAAmG,CACpG,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,QAAQ,GAAgB;QAC5B,GAAG,EAAE,OAAO,CAAC,gBAAgB;YAC3B,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;QAChC,IAAI,EAAE,OAAO,CAAC,gBAAgB;YAC5B,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB;KACjC,CAAA;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,gBAAO,CAAC,GAAG,CACT,gDAAgD,iBAAiB,gBAAgB,OAAO,CAAC,WAAW,iBAAiB,OAAO,2BAA2B,CACxJ,CAAA;QACD,OAAM;IACR,CAAC;IAED,MAAM,IAAA,mBAAa,EAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAA;IAE5D,gBAAO,CAAC,GAAG,CACT,8BAA8B,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,WAAW,iBAAiB,OAAO,EAAE,CAC5F,CAAA;IAED,MAAM,SAAS,GACb,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvE,CAAC,CAAC,OAAO,CAAC,gBAAgB;QAC1B,CAAC,CAAC,EAAE,CAAA;IAER,MAAM,gBAAgB,GAAG,MAAM,IAAA,sCAA6B,GAAE,CAAA;IAC9D,MAAM,SAAS,GAAG,MAAM,IAAA,+BAAsB,GAAE,CAAA;IAChD,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,IAAI,aAAa,CAAA;IAEpD,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,iBAAiB,SAAS,EAAE,CAAA;QACjD,MAAM,YAAY,GAAG,GAAG,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,WAAW,IAAI,YAAY,EAAE,CAAA;QAC7E,MAAM,YAAY,GAAG,MAAM,IAAA,yBAAmB,EAC5C,OAAO,CAAC,WAAW,EACnB,YAAY,EACZ,OAAO,CAAC,gBAAgB,CACzB,CAAA;QAED,IAAI,YAAY,EAAE,CAAC;YACjB,gBAAO,CAAC,KAAK,CACX,4BAA4B,YAAY,OAAO,OAAO,mBAAmB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAChG,CAAA;YACD,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAAA;YACvC,MAAM,IAAA,+BAAyB,EAC7B,OAAO,CAAC,WAAW,EACnB,YAAY,EACZ,OAAO,EACP,OAAO,CAAC,gBAAgB,CACzB,CAAA;YACD,gBAAO,CAAC,OAAO,CAAC,qCAAqC,CAAC,CAAA;QACxD,CAAC;aAAM,CAAC;YACN,gBAAO,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAA;YAC/D,MAAM,IAAA,gCAAuB,EAC3B,OAAO,CAAC,WAAW,EACnB,iBAAiB,EACjB,OAAO,EACP,gBAAgB,EAChB,SAAS,EACT,QAAQ,CAAC,GAAG,EACZ,SAAS,EACT,OAAO,EACP,OAAO,CAAC,iBAAiB,CAC1B,CAAA;YACD,gBAAO,CAAC,OAAO,CAAC,6CAA6C,CAAC,CAAA;QAChE,CAAC;QAED,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACnC,MAAM,IAAA,kCAAwB,EAC5B,GAAG,QAAQ,CAAC,GAAG,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,EAAE,EACnD,gBAAgB,EAChB,SAAS,CACV,CAAA;QACH,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gBAAO,CAAC,KAAK,CAAC,wCAAwC,EAAE,KAAK,CAAC,CAAA;QAC9D,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC"}
|
|
@@ -13,6 +13,11 @@
|
|
|
13
13
|
"type": "string",
|
|
14
14
|
"description": "The docker registry"
|
|
15
15
|
},
|
|
16
|
+
"disableEcrCaching": {
|
|
17
|
+
"type": "boolean",
|
|
18
|
+
"description": "Disable ECR caching",
|
|
19
|
+
"default": false
|
|
20
|
+
},
|
|
16
21
|
"ociEcrRegistry": {
|
|
17
22
|
"type": "string",
|
|
18
23
|
"description": "The docker registry in oci format (AWS ECR)"
|
package/dist/src/index.js
CHANGED
|
@@ -27,6 +27,10 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
27
27
|
? projectConfiguration.metadata &&
|
|
28
28
|
projectConfiguration.metadata['ecrRegistry']
|
|
29
29
|
: undefined;
|
|
30
|
+
const disableEcrCaching = isDockerProject
|
|
31
|
+
? projectConfiguration.metadata &&
|
|
32
|
+
projectConfiguration.metadata['disableEcrCaching']
|
|
33
|
+
: undefined;
|
|
30
34
|
const chartRegistry = isHelmProject
|
|
31
35
|
? projectConfiguration.metadata &&
|
|
32
36
|
projectConfiguration.metadata['chartRegistry']
|
|
@@ -96,6 +100,7 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
96
100
|
options: {
|
|
97
101
|
ecrRepository: ecrRegistry,
|
|
98
102
|
isPublicRepository: isPublicRegistry,
|
|
103
|
+
disableEcrCaching,
|
|
99
104
|
},
|
|
100
105
|
metadata: {
|
|
101
106
|
technologies: ['docker'],
|
|
@@ -109,6 +114,7 @@ async function createNodesInternal(configFilePath, options, context) {
|
|
|
109
114
|
cache: false,
|
|
110
115
|
options: {
|
|
111
116
|
ecrRegistry,
|
|
117
|
+
disableEcrCaching,
|
|
112
118
|
chartRegistry,
|
|
113
119
|
isPublicRegistry,
|
|
114
120
|
helmChartFolder,
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AA4BA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,7 @@ exports.mockReleaseGroup = {
|
|
|
38
38
|
updateDependents: 'auto',
|
|
39
39
|
groupPreVersionCommand: '',
|
|
40
40
|
logUnchangedProjects: true,
|
|
41
|
+
preserveMatchingDependencyRanges: false,
|
|
41
42
|
},
|
|
42
43
|
resolvedVersionPlans: [],
|
|
43
44
|
changelog: false,
|
|
@@ -57,5 +58,7 @@ exports.mockFinalConfig = {
|
|
|
57
58
|
preserveLocalDependencyProtocols: false,
|
|
58
59
|
versionActionsOptions: {},
|
|
59
60
|
manifestRootsToUpdate: [],
|
|
61
|
+
preserveMatchingDependencyRanges: false,
|
|
62
|
+
dockerOptions: {},
|
|
60
63
|
};
|
|
61
64
|
//# sourceMappingURL=version-actions.mock.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version-actions.mock.js","sourceRoot":"","sources":["../../../src/scripts/version-actions.mock.ts"],"names":[],"mappings":";;;AAIa,QAAA,oBAAoB,GAA4B;IAC3D,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,KAAK;IACX,IAAI,EAAE;QACJ,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,CAAC,sBAAsB,CAAC;gBACjC,OAAO,EAAE;oBACP,UAAU,EAAE,wBAAwB;iBACrC;aACF;SACF;KACF;CACF,CAAA;AAEY,QAAA,gBAAgB,GAAyB;IACpD,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE,CAAC,cAAc,CAAC;IAC1B,OAAO,EAAE;QACP,mBAAmB,EAAE,KAAK;QAC1B,mBAAmB,EAAE,IAAI;QACzB,iBAAiB,EAAE,EAAE;QACrB,eAAe,EAAE,sBAAsB;QACvC,qBAAqB,EAAE,EAAE;QACzB,cAAc,EAAE,gCAAgC;QAChD,sBAAsB,EAAE,SAAS;QACjC,8BAA8B,EAAE,EAAE;QAClC,8BAA8B,EAAE,MAAM;QACtC,aAAa,EAAE,EAAE;QACjB,gCAAgC,EAAE,KAAK;QACvC,qBAAqB,EAAE,EAAE;QACzB,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,IAAI;QACxB,gBAAgB,EAAE,MAAM;QACxB,sBAAsB,EAAE,EAAE;QAC1B,oBAAoB,EAAE,IAAI;
|
|
1
|
+
{"version":3,"file":"version-actions.mock.js","sourceRoot":"","sources":["../../../src/scripts/version-actions.mock.ts"],"names":[],"mappings":";;;AAIa,QAAA,oBAAoB,GAA4B;IAC3D,IAAI,EAAE,cAAc;IACpB,IAAI,EAAE,KAAK;IACX,IAAI,EAAE;QACJ,IAAI,EAAE,mBAAmB;QACzB,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,CAAC,sBAAsB,CAAC;gBACjC,OAAO,EAAE;oBACP,UAAU,EAAE,wBAAwB;iBACrC;aACF;SACF;KACF;CACF,CAAA;AAEY,QAAA,gBAAgB,GAAyB;IACpD,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE,CAAC,cAAc,CAAC;IAC1B,OAAO,EAAE;QACP,mBAAmB,EAAE,KAAK;QAC1B,mBAAmB,EAAE,IAAI;QACzB,iBAAiB,EAAE,EAAE;QACrB,eAAe,EAAE,sBAAsB;QACvC,qBAAqB,EAAE,EAAE;QACzB,cAAc,EAAE,gCAAgC;QAChD,sBAAsB,EAAE,SAAS;QACjC,8BAA8B,EAAE,EAAE;QAClC,8BAA8B,EAAE,MAAM;QACtC,aAAa,EAAE,EAAE;QACjB,gCAAgC,EAAE,KAAK;QACvC,qBAAqB,EAAE,EAAE;QACzB,YAAY,EAAE,KAAK;QACnB,kBAAkB,EAAE,IAAI;QACxB,gBAAgB,EAAE,MAAM;QACxB,sBAAsB,EAAE,EAAE;QAC1B,oBAAoB,EAAE,IAAI;QAC1B,gCAAgC,EAAE,KAAK;KACxC;IACD,oBAAoB,EAAE,EAAE;IACxB,SAAS,EAAE,KAAK;IAChB,oBAAoB,EAAE,aAAa;IACnC,iBAAiB,EAAE,0BAA0B;IAC7C,qCAAqC,EAAE,KAAK;IAC5C,8BAA8B,EAAE,KAAK;IACrC,4BAA4B,EAAE,KAAK;IACnC,YAAY,EAAE,KAAK;CACpB,CAAA;AAEY,QAAA,eAAe,GAA0B;IACpD,eAAe,EAAE,sBAAsB;IACvC,sBAAsB,EAAE,SAAS;IACjC,8BAA8B,EAAE,EAAE;IAClC,8BAA8B,EAAE,MAAM;IACtC,aAAa,EAAE,EAAE;IACjB,gCAAgC,EAAE,KAAK;IACvC,qBAAqB,EAAE,EAAE;IACzB,qBAAqB,EAAE,EAAE;IACzB,gCAAgC,EAAE,KAAK;IACvC,aAAa,EAAE,EAAE;CAClB,CAAA"}
|
|
@@ -169,6 +169,10 @@ async function getAffectedProjects(releaseGroups) {
|
|
|
169
169
|
}
|
|
170
170
|
const normalizedIncludes = includes.length > 0 ? includes : ['*'];
|
|
171
171
|
const result = await exports.nxFns.getAffectedProjectCliWithFilters(normalizedIncludes, excludes);
|
|
172
|
-
|
|
172
|
+
// This is a bit of a hack to get the list of affected projects in case NX daemon set write in stdout
|
|
173
|
+
// This case can happens when having chatty inference plugin locally.
|
|
174
|
+
// In this case, the daemon will write the list of affected projects in the last line of the stdout
|
|
175
|
+
const lastLine = result.stdout.trim().split('\n').pop();
|
|
176
|
+
return JSON.parse(lastLine);
|
|
173
177
|
}
|
|
174
178
|
//# sourceMappingURL=nx.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../src/utils/common/nx.ts"],"names":[],"mappings":";;;AA6BA,sCAgCC;AA0DD,gCAeC;AAkCD,
|
|
1
|
+
{"version":3,"file":"nx.js","sourceRoot":"","sources":["../../../../src/utils/common/nx.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ import { Result } from 'tinyexec';
|
|
|
10
10
|
* @param registry - Docker registry URL
|
|
11
11
|
* @param extraTags - Optional additional tags for the image
|
|
12
12
|
* @param appName
|
|
13
|
+
* @param disableEcrCache
|
|
13
14
|
* @return {Promise<Result>}
|
|
14
15
|
*/
|
|
15
|
-
export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string): Promise<Result>;
|
|
16
|
+
export declare function buildAndPushDockerImage(imageName: string, dockerfilePath: string, version: string, gitRepoUrl: string, commitSha: string, registry: string, extraTags: string[], appName: string, disableEcrCache: boolean): Promise<Result>;
|
package/dist/src/utils/docker.js
CHANGED
|
@@ -44,9 +44,10 @@ async function setupDockerBuilder(appName) {
|
|
|
44
44
|
* @param registry - Docker registry URL
|
|
45
45
|
* @param extraTags - Optional additional tags for the image
|
|
46
46
|
* @param appName
|
|
47
|
+
* @param disableEcrCache
|
|
47
48
|
* @return {Promise<Result>}
|
|
48
49
|
*/
|
|
49
|
-
async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName) {
|
|
50
|
+
async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRepoUrl, commitSha, registry, extraTags = [], appName, disableEcrCache) {
|
|
50
51
|
appName = appName.replaceAll('@', '-').replaceAll('/', '-');
|
|
51
52
|
const buildContextName = await setupDockerBuilder(appName);
|
|
52
53
|
// Build all tags including base version and extra tags
|
|
@@ -60,11 +61,13 @@ async function buildAndPushDockerImage(imageName, dockerfilePath, version, gitRe
|
|
|
60
61
|
const branch = await (0, github_1.getSanitizedCurrentGitBranch)();
|
|
61
62
|
const branchCacheRef = `${registry}/${imageName}:cache-build-${branch}`;
|
|
62
63
|
const mainCacheRef = `${registry}/${imageName}:cache-build-main`;
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
64
|
+
if (!disableEcrCache) {
|
|
65
|
+
cacheArgParts.push(`--cache-from type=registry,ref=${branchCacheRef}`);
|
|
66
|
+
if (!(0, github_1.isDefaultBranch)(branch)) {
|
|
67
|
+
cacheArgParts.push(`--cache-from type=registry,ref=${mainCacheRef}`);
|
|
68
|
+
}
|
|
69
|
+
cacheArgParts.push(`--cache-to type=registry,ref=${branchCacheRef},mode=max`);
|
|
66
70
|
}
|
|
67
|
-
cacheArgParts.push(`--cache-to type=registry,ref=${branchCacheRef},mode=max`);
|
|
68
71
|
}
|
|
69
72
|
const runCmd = [
|
|
70
73
|
`docker buildx build ${tagArgs}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/utils/docker.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,7 +110,7 @@ export declare enum Action {
|
|
|
110
110
|
StackManagedStateImport = "STACK_MANAGED_STATE_IMPORT",
|
|
111
111
|
StackManagedStateRollback = "STACK_MANAGED_STATE_ROLLBACK",
|
|
112
112
|
StackReslug = "STACK_RESLUG",
|
|
113
|
-
|
|
113
|
+
StackRoleBindingManage = "STACK_ROLE_BINDING_MANAGE",
|
|
114
114
|
StackSetCurrentCommit = "STACK_SET_CURRENT_COMMIT",
|
|
115
115
|
StackSetStar = "STACK_SET_STAR",
|
|
116
116
|
StackSyncCommit = "STACK_SYNC_COMMIT",
|
|
@@ -8896,7 +8896,7 @@ export type StackPolicyAttachmentEvaluationSampleArgs = {
|
|
|
8896
8896
|
export type StackRoleBinding = {
|
|
8897
8897
|
__typename?: 'StackRoleBinding';
|
|
8898
8898
|
id: Scalars['ID']['output'];
|
|
8899
|
-
|
|
8899
|
+
role: Role;
|
|
8900
8900
|
spaceID: Scalars['ID']['output'];
|
|
8901
8901
|
stackID: Scalars['ID']['output'];
|
|
8902
8902
|
};
|
|
@@ -68,7 +68,7 @@ var Action;
|
|
|
68
68
|
Action["StackManagedStateImport"] = "STACK_MANAGED_STATE_IMPORT";
|
|
69
69
|
Action["StackManagedStateRollback"] = "STACK_MANAGED_STATE_ROLLBACK";
|
|
70
70
|
Action["StackReslug"] = "STACK_RESLUG";
|
|
71
|
-
Action["
|
|
71
|
+
Action["StackRoleBindingManage"] = "STACK_ROLE_BINDING_MANAGE";
|
|
72
72
|
Action["StackSetCurrentCommit"] = "STACK_SET_CURRENT_COMMIT";
|
|
73
73
|
Action["StackSetStar"] = "STACK_SET_STAR";
|
|
74
74
|
Action["StackSyncCommit"] = "STACK_SYNC_COMMIT";
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@payfit/nx-core",
|
|
3
|
-
"version": "4.57.
|
|
3
|
+
"version": "4.57.4-ephemeral-opt-out-docker-ecr-cache.0",
|
|
4
4
|
"type": "commonjs",
|
|
5
5
|
"main": "./dist/src/index.js",
|
|
6
6
|
"types": "./dist/src/index.d.ts",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"@aws-sdk/client-ecr": "^3.835.0",
|
|
16
16
|
"@aws-sdk/client-ecr-public": "^3.887.0",
|
|
17
17
|
"@graphql-typed-document-node/core": "^3.2.0",
|
|
18
|
-
"@nx/devkit": "21.
|
|
18
|
+
"@nx/devkit": "21.6.2",
|
|
19
19
|
"@octokit/auth-app": "^8.0.2",
|
|
20
20
|
"@octokit/rest": "^22.0.0",
|
|
21
21
|
"args-tokenizer": "^0.3.0",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"zod": "^4.0.0"
|
|
34
34
|
},
|
|
35
35
|
"peerDependencies": {
|
|
36
|
-
"@nx/devkit": "^21.
|
|
36
|
+
"@nx/devkit": "^21.5",
|
|
37
37
|
"@nx/js": "^21.3",
|
|
38
38
|
"@nx/vite": "^21.3",
|
|
39
39
|
"nx": "^21.3"
|