runlify 0.0.430 → 0.0.432
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/build/projectsGeneration/builders/SystemMetaBuilder.js +31 -6
- package/build/projectsGeneration/generators/fileTemplates/back/environment/gitlabCi.js +8 -7
- package/build/types/projectsGeneration/builders/SystemMetaBuilder.d.ts +2 -1
- package/build/types/projectsGeneration/builders/buildedTypes.d.ts +2 -0
- package/package.json +1 -1
|
@@ -147,9 +147,24 @@ var SystemMetaBuilder = /** @class */ (function () {
|
|
|
147
147
|
this.addConfigVar('es.password', 'string', false, '', 'Пароль для авторизации в облачном сервисе ElasticSearch');
|
|
148
148
|
this.addConfigVar('es.node', 'string', false, 'http://localhost:9200', 'Нода эластика');
|
|
149
149
|
this.addConfigVar('es.tls.rejectUnauthorized', 'bool', false, false, 'Запрещать невалидный ssl сертификат');
|
|
150
|
-
this.addDeployEnvironment(
|
|
151
|
-
|
|
152
|
-
|
|
150
|
+
this.addDeployEnvironment({
|
|
151
|
+
name: 'dev',
|
|
152
|
+
manualDeploy: false,
|
|
153
|
+
clusterName: 'stage',
|
|
154
|
+
branchName: 'master',
|
|
155
|
+
});
|
|
156
|
+
this.addDeployEnvironment({
|
|
157
|
+
name: 'stage',
|
|
158
|
+
manualDeploy: false,
|
|
159
|
+
clusterName: 'stage',
|
|
160
|
+
branchName: 'stage',
|
|
161
|
+
});
|
|
162
|
+
this.addDeployEnvironment({
|
|
163
|
+
name: 'prod',
|
|
164
|
+
manualDeploy: true,
|
|
165
|
+
clusterName: 'stage',
|
|
166
|
+
branchName: 'release',
|
|
167
|
+
});
|
|
153
168
|
this.addLanguage('en', 'English');
|
|
154
169
|
this.addLanguage('ru', 'Russian');
|
|
155
170
|
if (!['en', 'ru'].includes(defaultLanguage)) {
|
|
@@ -243,8 +258,18 @@ var SystemMetaBuilder = /** @class */ (function () {
|
|
|
243
258
|
}
|
|
244
259
|
this.defaultLanguage = id;
|
|
245
260
|
};
|
|
246
|
-
SystemMetaBuilder.prototype.addDeployEnvironment = function (
|
|
247
|
-
this.deployEnvironments.
|
|
261
|
+
SystemMetaBuilder.prototype.addDeployEnvironment = function (deployEnvironment) {
|
|
262
|
+
if (this.deployEnvironments.some(function (f) { return f.name === deployEnvironment.name; })) {
|
|
263
|
+
throw new Error("There is already deployEnvironment with name \"".concat(deployEnvironment.name, "\""));
|
|
264
|
+
}
|
|
265
|
+
this.deployEnvironments.push(deployEnvironment);
|
|
266
|
+
return this;
|
|
267
|
+
};
|
|
268
|
+
SystemMetaBuilder.prototype.delDeployEnvironment = function (name) {
|
|
269
|
+
if (!this.deployEnvironments.some(function (f) { return f.name === name; })) {
|
|
270
|
+
throw new Error("There is no \"".concat(name, "\" config var"));
|
|
271
|
+
}
|
|
272
|
+
this.deployEnvironments = this.deployEnvironments.filter(function (v) { return v.name !== name; });
|
|
248
273
|
return this;
|
|
249
274
|
};
|
|
250
275
|
SystemMetaBuilder.prototype.addTelegramBot = function (name, title) {
|
|
@@ -452,4 +477,4 @@ var SystemMetaBuilder = /** @class */ (function () {
|
|
|
452
477
|
return SystemMetaBuilder;
|
|
453
478
|
}());
|
|
454
479
|
exports.default = SystemMetaBuilder;
|
|
455
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SystemMetaBuilder.js","sourceRoot":"","sources":["../../../src/projectsGeneration/builders/SystemMetaBuilder.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAKiB;AACjB,oEAA6C;AAC7C,sEAA+C;AAC/C,6DAA2D;AAC3D,4EAA0E;AAa1E,sDAAoD;AACpD,uCAA0B;AAC1B,kEAA2C;AAC3C,oEAA6C;AAC7C,0EAAmD;AAEnD,4EAAqD;AAExC,QAAA,gBAAgB,GAAqC;IAChE,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,QAAQ,EAAE,IAAI;IACd,MAAM,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC;CAC1C,CAAA;AAED;IAwBE,4DAA4D;IAC5D,uDAAuD;IAEvD,cAAc;IACd,2BACE,MAAc,EACd,OAA+D,EAC/D,eAAsB;QADtB,wBAAA,EAAA,UAAkC,qCAA6B;QAC/D,gCAAA,EAAA,sBAAsB;QA9BxB,aAAQ,GAA+C,EAAE,CAAA;QACzD,YAAO,GAA8C,EAAE,CAAA;QACvD,cAAS,GAAgD,EAAE,CAAA;QAC3D,mBAAc,GAAoD,EAAE,CAAA;QACpE,kBAAa,GAAmD,EAAE,CAAA;QAClE,eAAU,GAAgB,EAAE,CAAA;QAC5B,aAAQ,GAAe,EAAE,CAAA;QACzB,aAAQ,GAAc,EAAE,CAAA;QACxB,uBAAkB,GAAwB,EAAE,CAAA;QAC5C,iBAAY,GAAyB,EAAE,CAAA;QACvC,cAAS,GAAe,EAAE,CAAA;QAC1B,aAAQ,GAAqB,EAAE,CAAA;QAC/B,YAAO,GAAwB,EAAE,CAAA;QACjC,UAAK,GAAkB,EAAE,CAAA;QAIzB,SAAI,GAAG,QAAQ,CAAA;QACf,WAAM,GAAG,QAAQ,CAAA;QACjB,YAAO,GAAG,QAAQ,CAAA;QAahB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QACtB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QACpB,IAAI,CAAC,IAAI,GAAG,IAAI,2BAAiB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;QAE3D,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,wBAAwB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,0BAA0B,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACtG,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,0BAA0B,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAEtG,IAAI,CAAC,YAAY,CACf,UAAU,EACV,QAAQ,EACR,IAAI,EACJ,IAAI,CAAC,OAAO,CAAC,aAAa,EAC1B,iCAAiC,CAClC,CAAA;QACD,IAAI,CAAC,YAAY,CACf,WAAW,EACX,QAAQ,EACR,KAAK,EACL,IAAI,CAAC,OAAO,CAAC,WAAW,EACxB,kCAAkC,CACnC,CAAA;QACD,IAAI,CAAC,YAAY,CACf,iBAAiB,EACjB,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,oBAAoB,CACrB,CAAA;QACD,IAAI,CAAC,YAAY,CACf,YAAY,EACZ,QAAQ,EACR,KAAK,EACL,uBAAuB,EACvB,6DAA6D,CAC9D,CAAA;QAED,gBAAgB;QAChB,IAAI,CAAC,YAAY,CACf,yBAAyB,EACzB,QAAQ,EACR,IAAI,EACJ,+CAA+C,EAC/C,sDAAsD,CACvD,CAAA;QACD,IAAI,CAAC,YAAY,CACf,4BAA4B,EAC5B,QAAQ,EACR,KAAK,EACL,+CAA+C,EAC/C,sDAAsD,CACvD,CAAA;QACD,IAAI,CAAC,YAAY,CACf,gCAAgC,EAChC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,sEAAsE,CACvE,CAAA;QACD,IAAI,CAAC,YAAY,CACf,6BAA6B,EAC7B,QAAQ,EACR,IAAI,EACJ,+CAA+C,EAC/C,qIAAqI,CACtI,CAAA;QAED,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,EACR,KAAK,EACL,WAAW,EACX,mDAAmD,CACpD,CAAA;QACD,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,EACR,KAAK,EACL,WAAW,EACX,yDAAyD,CAC1D,CAAA;QAED,IAAI,CAAC,YAAY,CACf,aAAa,EACb,QAAQ,EACR,IAAI,EACJ,+BAA+B,EAC/B,4CAA4C,CAC7C,CAAA;QACD,IAAI,CAAC,YAAY,CACf,WAAW,EACX,QAAQ,EACR,IAAI,EACJ,cAAc,EACd,4CAA4C,CAC7C,CAAA;QACD,IAAI,CAAC,YAAY,CACf,gBAAgB,EAChB,QAAQ,EACR,IAAI,EACJ,EAAE,EACF,4CAA4C,CAC7C,CAAA;QACD,IAAI,CAAC,YAAY,CACf,oBAAoB,EACpB,QAAQ,EACR,IAAI,EACJ,EAAE,EACF,qCAAqC,CACtC,CAAA;QACD,IAAI,CAAC,YAAY,CACf,sBAAsB,EACtB,QAAQ,EACR,IAAI,EACJ,EAAE,EACF,uDAAuD,CACxD,CAAC;QACF,IAAI,CAAC,YAAY,CACf,8BAA8B,EAC9B,QAAQ,EACR,IAAI,EACJ,EAAE,EACF,mFAAmF,CACpF,CAAC;QAEF,IAAI,CAAC,YAAY,CACf,cAAc,EACd,QAAQ,EACR,KAAK,EACL,uBAAuB,EACvB,wDAAwD,CACzD,CAAA;QACD,IAAI,CAAC,YAAY,CACf,2BAA2B,EAC3B,QAAQ,EACR,KAAK,EACL,EAAE,EACF,4CAA4C,CAC7C,CAAA;QACD,IAAI,CAAC,YAAY,CACf,+BAA+B,EAC/B,OAAO,EACP,KAAK,EACL,GAAG,EACH,0CAA0C,CAC3C,CAAA;QACD,IAAI,CAAC,YAAY,CACf,2BAA2B,EAC3B,QAAQ,EACR,KAAK,EACL,EAAE,EACF,4CAA4C,EAC5C,CAAC,WAAW,CAAC,CACd,CAAA;QAED,IAAI,CAAC,YAAY,CACf,8BAA8B,EAC9B,QAAQ,EACR,KAAK,EACL,EAAE,EACF,iDAAiD,CAClD,CAAA;QACD,IAAI,CAAC,YAAY,CACf,kCAAkC,EAClC,QAAQ,EACR,KAAK,EACL,KAAK,EACL,0CAA0C,CAC3C,CAAA;QACD,IAAI,CAAC,YAAY,CACf,8BAA8B,EAC9B,QAAQ,EACR,KAAK,EACL,EAAE,EACF,iDAAiD,EACjD,CAAC,aAAa,CAAC,CAChB,CAAA;QAED,IAAI,CAAC,YAAY,CACf,UAAU,EACV,QAAQ,EACR,KAAK,EACL,EAAE,EACF,+DAA+D,CAChE,CAAA;QAED,IAAI,CAAC,YAAY,CACf,aAAa,EACb,QAAQ,EACR,KAAK,EACL,OAAO,EACP,6BAA6B,CAC9B,CAAA;QAED,IAAI,CAAC,YAAY,CACf,4BAA4B,EAC5B,MAAM,EACN,KAAK,EACL,IAAI,EACJ,6CAA6C,CAC9C,CAAA;QAED,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,sCAAsC,CAAC,CAAC;QACrG,IAAI,CAAC,YAAY,CAAC,qCAAqC,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,0CAA0C,CAAC,CAAC;QAE3H,QAAQ;QACR,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,QAAQ,EAAE,KAAK,EAAE,iCAAiC,EAAE,uBAAuB,CAAC,CAAC;QAChH,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,0BAA0B,CAAC,CAAC;QACrF,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,wBAAwB,CAAC,CAAC;QACnF,IAAI,CAAC,YAAY,CAAC,6BAA6B,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,+DAA+D,CAAC,CAAC;QACpI,IAAI,CAAC,YAAY,CAAC,8BAA8B,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,oHAAoH,CAAC,CAAC;QAC7L,IAAI,CAAC,YAAY,CAAC,kCAAkC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,2HAA2H,CAAC,CAAC;QACxM,IAAI,CAAC,YAAY,CAAC,uBAAuB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,kDAAkD,CAAC,CAAC;QAChH,IAAI,CAAC,YAAY,CAAC,8BAA8B,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,iCAAiC,CAAC,CAAC;QAC7G,wMAAwM;QACxM,iMAAiM;QACjM,IAAI,CAAC,YAAY,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,2IAA2I,CAAC,CAAC;QACpM,IAAI,CAAC,YAAY,CAAC,oBAAoB,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,kCAAkC,CAAC,CAAC;QAChG,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,wBAAwB,CAAC,CAAC;QACrF,IAAI,CAAC,YAAY,CAAC,8BAA8B,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,qCAAqC,CAAC,CAAC;QAE/G,KAAK;QACL,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACzE,IAAI,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,yDAAyD,CAAC,CAAC;QAChH,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,+DAA+D,CAAC,CAAC;QACvH,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,yDAAyD,CAAC,CAAC;QACjH,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,EAAE,eAAe,CAAC,CAAC;QACxF,IAAI,CAAC,YAAY,CAAC,2BAA2B,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,qCAAqC,CAAC,CAAC;QAE5G,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAA;QACzC,IAAI,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAC3C,IAAI,CAAC,oBAAoB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QAC1C,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QACjC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QACjC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;YAC3C,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,CAAA;SAClC;QAED,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QAEtC,gCAAgC;QAEhC,IAAI,CAAC,mBAAmB,EAAE,CAAA;QAE1B,OAAO;QACP,qDAAqD;QACrD,4DAA4D;QAE5D,OAAO;QACP,2CAA2C;QAC3C,uCAAuC;IACzC,CAAC;IAED,mCAAO,GAAP,UAAQ,IAAY;QAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,sCAAU,GAAV,UAAW,OAAe;QACxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAEtB,OAAO,IAAI,CAAA;IACb,CAAC;IAED,qCAAS,GAAT,UAAU,MAAc;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QAEpB,OAAO,IAAI,CAAA;IACb,CAAC;IAGD,aAAa;IACb,UAAU;IACV,aAAa;IACb,YAAY;IACZ,WAAW;IACX,eAAe;IACf,WAAW;IAEX,wCAAY,GAAZ,UACE,IAAY,EACZ,IAAO,EACP,QAAiB,EACjB,GAA+B,EAC/B,OAAe,EACf,MAA4D;QAA5D,uBAAA,EAAA,UAA4B,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC;QAE5D,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAChD,MAAM,IAAI,KAAK,CAAC,YAAI,IAAI,iCAA6B,CAAC,CAAA;SACvD;QAED,IAAI,CAAC,UAAU,CAAC,IAAI,CAClB,CAAC,CAAC,aAAa,CACb;YACE,IAAI,MAAA;YACJ,IAAI,MAAA;YACJ,QAAQ,UAAA;YACR,OAAO,EAAE,GAAG;YACZ,OAAO,SAAA;YACP,MAAM,QAAA;SACM,EACd,wBAAgB,CACJ,CACf,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,wCAAY,GAAZ,UACE,IAAY;QAEZ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YACjD,MAAM,IAAI,KAAK,CAAC,wBAAgB,IAAI,kBAAc,CAAC,CAAA;SACpD;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,CAAA;QAE9D,OAAO,IAAI,CAAA;IACb,CAAC;IAED,oDAAwB,GAAxB,UACE,IAAY,EACZ,GAA+B;QAE/B,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YACjD,MAAM,IAAI,KAAK,CAAC,wBAAgB,IAAI,kBAAc,CAAC,CAAA;SACpD;QAED,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,sBAAI,EAAE,KAAE,OAAO,EAAE,GAAG,GAAc,CAAC,CAAC,CAAC,EAAE,EAA1D,CAA0D,CAAC,CAAA;QAEvG,OAAO,IAAI,CAAA;IACb,CAAC;IAED,uDAA2B,GAA3B,UAA4B,IAAY,EAAE,GAAW;QACnD,IAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,CAAA;QAE7D,IAAI,CAAC,QAAQ,EAAE;YACb,MAAM,IAAI,KAAK,CAAC,wBAAgB,IAAI,kBAAc,CAAC,CAAA;SACpD;QAED,IAAI,CAAC,UAAU,mCACV,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC;kCAE5C,QAAQ,KACX,OAAO,EAAE,GAAG;iBAEf,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED,uCAAW,GAAX,UAAY,EAAU,EAAE,KAAc;QACpC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAC,EAAI;gBAAH,EAAE,QAAA;YAAM,OAAA,EAAE;QAAF,CAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YAClD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAC,EAAE,IAAA,EAAE,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,EAAC,CAAC,CAAA;SAC9C;IACH,CAAC;IAED,0CAAc,GAAd,UAAe,EAAU;QACvB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,EAAE,KAAK,EAAE,EAAd,CAAc,CAAC,CAAA;IAChE,CAAC;IAED,8CAAkB,GAAlB,UAAmB,EAAU;QAC3B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,UAAC,EAAI;gBAAH,EAAE,QAAA;YAAM,OAAA,EAAE;QAAF,CAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;YAClD,MAAM,IAAI,KAAK,CAAC,wBAAgB,EAAE,gBAAY,CAAC,CAAA;SAChD;QAED,IAAI,CAAC,eAAe,GAAG,EAAE,CAAA;IAC3B,CAAC;IAED,gDAAoB,GAApB,UAAqB,IAAY,EAAE,WAAmB;QACpD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,IAAI,MAAA,EAAE,WAAW,aAAA,EAAE,CAAC,CAAA;QAEnD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,0CAAc,GAAd,UAAe,IAAY,EAAE,KAAc;QACzC,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAClD,MAAM,IAAI,KAAK,CAAC,mDAA2C,IAAI,OAAG,CAAC,CAAA;SACpE;QAED,IAAM,WAAW,GAAG,IAAI,4BAAkB,CACxC,IAAI,EACJ,IAAI,CAAC,eAAe,EACpB,KAAK,CACN,CAAA;QAED,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;QAEnC,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,WAAW;IACX,uCAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IAED,sCAAU,GAAV,UACE,IAAY,EACZ,KAGC,EACD,OAA2C;QAA3C,wBAAA,EAAA,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,EAAU;QAE3C,IACE,gCAAI,IAAI,CAAC,QAAQ,SAAK,IAAI,CAAC,SAAS,QAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,EACzE;YACA,MAAM,IAAI,KAAK,CAAC,8CAAsC,IAAI,OAAG,CAAC,CAAA;SAC/D;QAED,IAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QAErE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;QAEhD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,4CAAgB,GAAhB,UAAiB,IAAY;QAC3B,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,CAAA;QAEjE,IAAI,CAAC,OAAO,EAAE;YACZ,MAAM,IAAI,KAAK,CAAC,wBAAgB,IAAI,eAAW,CAAC,CAAA;SACjD;QAED,OAAO,OAAO,CAAC,MAAM,CAAA;IACvB,CAAC;IAED,iDAAqB,GAArB,UAAsB,IAAY;QAChC,IAAM,YAAY,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,CAAA;QAE5E,IAAI,CAAC,YAAY,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,wBAAgB,IAAI,oBAAgB,CAAC,CAAA;SACtD;QAED,OAAO,YAAY,CAAC,MAAM,CAAA;IAC5B,CAAC;IAED,sCAAU,GAAV,UAAW,IAAY,EAAE,IAAY,EAAE,KAAc;QACnD,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,gDAAwC,IAAI,OAAG,CAAC,CAAA;SACjE;QAED,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,gDAAwC,IAAI,OAAG,CAAC,CAAA;SACjE;QAED,IAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QAE3E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAE3B,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,qCAAS,GAAT,UAAU,IAAY,EAAE,KAAc;QACpC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAC7C,MAAM,IAAI,KAAK,CAAC,gDAAwC,IAAI,OAAG,CAAC,CAAA;SACjE;QAED,IAAM,MAAM,GAAG,IAAI,2BAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QAEvE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;QAEzB,OAAO,MAAM,CAAA;IACf,CAAC;IAED,iDAAqB,GAArB,UACE,IAAY,EACZ,KAGC,EACD,OAA2C;QAA3C,wBAAA,EAAA,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,EAAU;QAE3C,IACE,gCAAI,IAAI,CAAC,QAAQ,SAAK,IAAI,CAAC,SAAS,QAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,EACzE;YACA,MAAM,IAAI,KAAK,CACb,8CAAsC,IAAI,wBAAa,IAAI,CAAC,IAAI,CAAE,CACnE,CAAA;SACF;QAED,IAAM,OAAO,GAAG,IAAI,wBAAc,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QACrE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;QAEhD,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,mCAAO,GAAP;QACE,OAAO,IAAI,CAAC,IAAI,CAAA;IAClB,CAAC;IAED,YAAY;IACZ,wCAAY,GAAZ;QACE,OAAO,IAAI,CAAC,SAAS,CAAA;IACvB,CAAC;IAED,uCAAW,GAAX,UACE,IAAY,EACZ,KAGC,EACD,OAA2C;QAA3C,wBAAA,EAAA,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,EAAU;QAE3C,IACE,gCAAI,IAAI,CAAC,QAAQ,SAAK,IAAI,CAAC,SAAS,QAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,EACzE;YACA,MAAM,IAAI,KAAK,CACb,8CAAsC,IAAI,wBAAa,IAAI,CAAC,IAAI,CAAE,CACnE,CAAA;SACF;QAED,IAAM,QAAQ,GAAG,IAAI,yBAAe,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QAEvE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;QAElD,OAAO,QAAQ,CAAA;IACjB,CAAC;IAED,qCAAS,GAAT,UACE,IAAY,EACZ,KAAc,EACd,OAA2C;QAA3C,wBAAA,EAAA,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,EAAU;QAE3C,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,EAAE;YACpD,MAAM,IAAI,KAAK,CACb,8CAAsC,IAAI,wBAAa,IAAI,CAAC,IAAI,CAAE,CACnE,CAAA;SACF;QAED,IAAM,MAAM,GAAG,IAAI,uBAAa,CAAC,IAAI,EAAE,IAAI,CAAC,eAAe,EAAE,KAAK,CAAC,CAAA;QAEnE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;QAE9C,OAAO,MAAM,CAAA;IACf,CAAC;IAED,2CAAe,GAAf,UACE,IAAY,EACZ,iBAA0B,EAC1B,KAGC,EACD,OAA2C;QAA3C,wBAAA,EAAA,UAAU,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAE,EAAU;QAE3C,IACE,gCAAI,IAAI,CAAC,QAAQ,SAAK,IAAI,CAAC,SAAS,QAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,EACzE;YACA,MAAM,IAAI,KAAK,CACb,8CAAsC,IAAI,wBAAa,IAAI,CAAC,IAAI,CAAE,CACnE,CAAA;SACF;QAED,IAAM,YAAY,GAAG,IAAI,yCAAmB,CAC1C,IAAI,EACJ,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,KAAK,CACN,CAAA;QAED,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,SAAA,EAAE,CAAC,CAAA;QAE3D,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,0CAAc,GAAd,UACE,IAAY,EACZ,iBAA0B,EAC1B,KAGC,EACD,OAAyB;QAEzB,IACE,gCAAI,IAAI,CAAC,QAAQ,SAAK,IAAI,CAAC,SAAS,QAAE,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,EAAtB,CAAsB,CAAC,EACzE;YACA,MAAM,IAAI,KAAK,CACb,8CAAsC,IAAI,wBAAa,IAAI,CAAC,IAAI,CAAE,CACnE,CAAA;SACF;QAED,IAAM,WAAW,GAAG,IAAI,4BAAkB,CACxC,IAAI,EACJ,iBAAiB,EACjB,IAAI,CAAC,eAAe,EACpB,KAAK,EACL,OAAO,CACR,CAAA;QAED,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAA;QAEvE,OAAO,WAAW,CAAA;IACpB,CAAC;IAED,2CAAe,GAAf,UAAgB,IAAY,EAAE,UAAkB;QAC9C,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,kCAA0B,IAAI,mBAAe,CAAC,CAAA;SAC/D;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,MAAA,EAAE,UAAU,YAAA,EAAE,CAAC,CAAA;QAExC,OAAO,IAAI,CAAA;IACb,CAAC;IAED,sCAAU,GAAV,UACE,eAAgC,EAChC,IAAY,EACZ,OAAe,EACf,OAAe;QAEf,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,IAAI,KAAK,IAAI,EAAf,CAAe,CAAC,EAAE;YAC9C,MAAM,IAAI,KAAK,CAAC,6BAAqB,IAAI,eAAW,CAAC,CAAA;SACtD;QAED,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YACjB,eAAe,iBAAA;YACf,IAAI,MAAA;YACJ,OAAO,SAAA;YACP,OAAO,SAAA;SACR,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,uCAAW,GAAX;QACE,OAAO,gCAAI,IAAI,CAAC,QAAQ,SAAK,IAAI,CAAC,SAAS,QAAE,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,CAAC;YACxD,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;YACzB,OAAO,EAAE,EAAE,CAAC,OAAO;SACpB,CAAC,EAHuD,CAGvD,CAAC,CAAA;IACL,CAAC;IAED,qDAAyB,GAAzB;QACE,OAAO;YACL,IAAI,CAAC,QAAQ;YACb,IAAI,CAAC,SAAS;YACd,IAAI,CAAC,cAAc;YACnB,IAAI,CAAC,aAAa;SACnB;aACE,IAAI,EAAE;aACN,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC;aAClB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,cAAc,EAAhB,CAAgB,CAAC,CAAA;IACpC,CAAC;IAED,+CAA+C;IAC/C,mCAAmC;IAEnC,iBAAiB;IACjB,iCAAiC;IACjC,aAAa;IACb,mCAAmC;IACnC,MAAM;IAEN,gBAAgB;IAChB,IAAI;IAEJ,4CAA4C;IAC5C,gCAAgC;IAEhC,iBAAiB;IACjB,8BAA8B;IAC9B,aAAa;IACb,gCAAgC;IAChC,MAAM;IAEN,gBAAgB;IAChB,IAAI;IAEJ,iCAAK,GAAL;QACE,IAAM,UAAU,GAAG,UAAyC,OAAY;YACtE,OAAA,CAAC,CAAC,MAAM,CACN,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAClD,OAAO,CACD;QAHR,CAGQ,CAAA;QAEV,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;YAC3C,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;YACjD,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;YACpD,YAAY,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE;gBAC/D,OAAA,EAAE,CAAC,KAAK,EAAE;YAAV,CAAU,CACX;YACD,UAAU,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC;YACrD,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAjB,CAAiB,CAAC;YAClE,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,EAAjB,CAAiB,CAAC;YACpE,cAAc,EAAE,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE;gBACrD,OAAA,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;YAAjB,CAAiB,CAClB;YACD,aAAa,EAAE,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,UAAC,EAAE;gBACnD,OAAA,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE;YAAjB,CAAiB,CAClB;YACD,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE;YAChC,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAC,EAAU;oBAAR,MAAM,YAAA;gBAAO,OAAA,MAAM,CAAC,KAAK,EAAE;YAAd,CAAc,CAAC;YACrE,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAC,GAAG;gBACxD,OAAA,GAAG,CAAC,KAAK,EAAE;YAAX,CAAW,CACZ;YACD,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,UAAC,MAAM;gBACzD,OAAA,MAAM,CAAC,KAAK,EAAE;YAAd,CAAc,CACf;YACD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAC,IAAI,IAAK,OAAA,IAAI,CAAC,KAAK,EAAE,EAAZ,CAAY,CAAC;YACvE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;SACxB,CAAA;IACH,CAAC;IAED,+CAAmB,GAAnB;QACE,IAAA,iCAAe,EAAC,IAAI,CAAC,CAAA;QAErB,OAAO,IAAI,CAAC,QAAQ,CAAA;IACtB,CAAC;IACH,wBAAC;AAAD,CAAC,AA9uBD,IA8uBC;AAED,kBAAe,iBAAiB,CAAA"}
|
|
480
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SystemMetaBuilder.js","sourceRoot":"","sources":["../../../src/projectsGeneration/builders/SystemMetaBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,9 @@ var gitlabCiTmpl = function (_a) {
|
|
|
8
8
|
var prefix = _a.system.prefix, system = _a.system, options = _a.options;
|
|
9
9
|
return "image: node:18\n".concat(options.skipWarningThisIsGenerated
|
|
10
10
|
? ''
|
|
11
|
-
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n - deploy-previous\n\ncache:\n paths:\n - .cache\n - .cache_images\n # - node_modules\n\nvariables:\n REPO_NAME: $CI_PROJECT_NAME\n VERBOSE: 'true'\n RELEASE: $CI_COMMIT_SHORT_SHA\n KUBECONFIG: /etc/deploy/config\n PROJECT_NAME: ").concat(system.name, "\n\ncheck:\n stage: check\n image: registry.gitlab.com/making.ventures/images/node-with-tools\n before_script:\n - yarn install --frozen-lockfile\n script:\n - ./check.sh\n variables:\n DATABASE_MAIN_WRITE_URI: $TEST_DATABASE_MAIN_WRITE_URI\n\ntag-previous-with-sha:\n extends: .tag-image\n stage: previous-image\n only
|
|
12
|
-
.
|
|
13
|
-
.map(function (e) { return "\n - ".concat(e.
|
|
11
|
+
: "\n# ".concat(utils_1.generatedWarning, "\n"), "\nstages:\n - check\n - previous-image\n - build\n - latest-image\n - deploy\n - deploy-previous\n\ncache:\n paths:\n - .cache\n - .cache_images\n # - node_modules\n\nvariables:\n REPO_NAME: $CI_PROJECT_NAME\n VERBOSE: 'true'\n RELEASE: $CI_COMMIT_SHORT_SHA\n KUBECONFIG: /etc/deploy/config\n PROJECT_NAME: ").concat(system.name, "\n\ncheck:\n stage: check\n image: registry.gitlab.com/making.ventures/images/node-with-tools\n before_script:\n - yarn install --frozen-lockfile\n script:\n - ./check.sh\n variables:\n DATABASE_MAIN_WRITE_URI: $TEST_DATABASE_MAIN_WRITE_URI\n\ntag-previous-with-sha:\n extends: .tag-image\n stage: previous-image\n only:").concat(system.deployEnvironments
|
|
12
|
+
.map(function (e) { return "\n - ".concat(e.branchName); }), "\n allow_failure: true # Firt run won't be able to create previous image\n variables:\n TAG_ORIGIN: :${CI_COMMIT_REF_SLUG}\n TAG_DESTINATION: :${CI_COMMIT_REF_SLUG}-previous-for-${CI_COMMIT_SHA}\n\nbuild:\n stage: build\n image:\n name: gcr.io/kaniko-project/executor:debug\n entrypoint: ['']\n before_script:\n - mkdir -p /kaniko/.docker\n - echo \"{\\\"auths\\\":{\\\"$CI_REGISTRY\\\":{\\\"username\\\":\\\"$CI_REGISTRY_USER\\\",\\\"password\\\":\\\"$CI_REGISTRY_PASSWORD\\\"}}}\" > /kaniko/.docker/config.json\n # - /kaniko/warmer --cache-dir=$CI_PROJECT_DIR/.cache_images --image=browserless/chrome\n script:\n - /kaniko/executor\n --cache-dir=$CI_PROJECT_DIR/.cache_images\n --context ${CI_PROJECT_DIR}\n --dockerfile ${CI_PROJECT_DIR}/Dockerfile\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}\n --destination ${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\n --single-snapshot\n only:").concat(system.deployEnvironments
|
|
13
|
+
.map(function (e) { return "\n - ".concat(e.branchName); }), "\n\ntag-latest:\n extends: .tag-image\n stage: latest-image\n only:\n - master\n variables:\n TAG_ORIGIN: master\n TAG_DESTINATION: latest\n\n.tag-image:\n image:\n name: gcr.io/go-containerregistry/crane:debug\n entrypoint: ['']\n script:\n - crane auth login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY\n - crane cp ${CI_REGISTRY_IMAGE}:${TAG_ORIGIN} ${CI_REGISTRY_IMAGE}:${TAG_DESTINATION}\n variables:\n GIT_STRATEGY: none\n\n").concat(system.deployEnvironments
|
|
14
14
|
.map(function (e) {
|
|
15
15
|
return "deploy-".concat(e.name, "-back:\n extends: .deploy-").concat(e.name === 'prod' || e.name === 'demo' ? 'prod' : 'dev', "-back\n stage: deploy\n variables:\n ENV: \"").concat(e.name, "\"\n CLUSTER_NAME: \"").concat(e.clusterName, "01\"\n").concat(e.name !== 'prod' && e.name !== 'dev' && e.name !== 'stage'
|
|
16
16
|
? " TAG: \":".concat(e.name, "\"")
|
|
@@ -55,13 +55,14 @@ var gitlabCiTmpl = function (_a) {
|
|
|
55
55
|
: '', "\n\n.deploy-dev-back:\n extends:\n - .deploy-dev\n - .deploy-back\n variables:\n KUBE_CONFIG: ${KUBE_STAGE01_CONFIG}\n BACK_ENABLED: \"true\"\n INGRESS_ENABLED: \"true\"\n METRICS_ENABLED: \"true\"\n WORKER_ENABLED: \"false\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"false\"\n\n.deploy-dev-workers:\n extends:\n - .deploy-dev\n - .deploy-worker\n variables:\n KUBE_CONFIG: ${KUBE_WORKERS01_CONFIG}\n BACK_ENABLED: \"false\"\n INGRESS_ENABLED: \"false\"\n METRICS_ENABLED: \"false\"\n WORKER_ENABLED: \"true\"\n BOT_ENABLED: \"true\"\n ROOT_ENABLED: \"false\"\n only:\n - master\n\n.deploy-prod-back:\n extends:\n - .deploy-prod\n - .deploy-back\n variables:\n KUBE_CONFIG: ${KUBE_PROD01_CONFIG}\n BACK_ENABLED: \"true\"\n INGRESS_ENABLED: \"true\"\n METRICS_ENABLED: \"true\"\n WORKER_ENABLED: \"false\"\n BOT_ENABLED: \"false\"\n ROOT_ENABLED: \"false\"\n\n.deploy-prod-workers:\n extends:\n - .deploy-prod\n - .deploy-worker\n variables:\n KUBE_CONFIG: ${KUBE_WORKERS01_CONFIG}\n BACK_ENABLED: \"false\"\n INGRESS_ENABLED: \"false\"\n METRICS_ENABLED: \"false\"\n WORKER_ENABLED: \"true\"\n BOT_ENABLED: \"true\"\n ROOT_ENABLED: \"false\"\n\n.deploy-dev:\n extends: .deploy\n variables:\n ENV: \"stage\"\n DEV: \"true\"\n HOST: \"making.ventures\"\n ROOT_ENABLED: \"false\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
56
56
|
.filter(function (v) { return v.scopes.includes('back') || v.scopes.includes('ci'); })
|
|
57
57
|
.map(function (v) { return "\n ".concat((0, change_case_1.constantCase)(v.name), ": ${DEV_").concat((0, change_case_1.constantCase)(v.name), "}"); })
|
|
58
|
-
.join(''), "\n only:\n - master\n\n
|
|
58
|
+
.join(''), "\n only:\n - master\n\n").concat(system.deployEnvironments
|
|
59
|
+
.map(function (e) { return ".deploy-".concat(e.name, ":\n extends: .deploy\n stage: deploy\n when: ").concat(e.manualDeploy ? 'manual' : 'on_success', "\n variables:\n ENV: \"").concat(e.name, "\"\n DEV: \"false\"\n HOST: \"making.ventures\"\n ROOT_ENABLED: \"true\"\n TAG: \":${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA}\"").concat(system.configVars
|
|
59
60
|
.filter(function (v) { return v.scopes.includes('back') || v.scopes.includes('ci'); })
|
|
60
|
-
.map(function (v) { return "\n ".concat((0, change_case_1.constantCase)(v.name), ": ${
|
|
61
|
-
.join(''), "\n only:\n -
|
|
61
|
+
.map(function (v) { return "\n ".concat((0, change_case_1.constantCase)(v.name), ": ${").concat(e.name.toUpperCase(), "_").concat((0, change_case_1.constantCase)(v.name), "}"); })
|
|
62
|
+
.join(''), "\n only:\n - ").concat(e.branchName); }), "\n\n.deploy-back:\n variables:\n DEPLOY_KIND: \"back\"\n\n.deploy-worker:\n variables:\n DEPLOY_KIND: \"worker\"\n\n.deploy-telegramBot:\n variables:\n DEPLOY_KIND: \"telegramBot\"\n\n.deploy:\n image:\n name: alpine/helm:3.9.0\n entrypoint: [\"\"]\n before_script:\n - mkdir -p /etc/deploy\n - echo ${KUBE_CONFIG} | base64 -d > ${KUBECONFIG}\n script:\n - NAMESPACE=${NAMESPACE:-\"").concat(options.k8sNamespacePrefix || prefix, "-${ENV}\"}\n - echo NAMESPACE ${NAMESPACE}\n - echo chart ${NAMESPACE}-${DEPLOY_KIND}\n\n - helm upgrade\n --install\n --wait ${NAMESPACE}-${DEPLOY_KIND} chart\n --timeout 3600s\n -f chart/values_${ENV}.yaml\n --set \"global.projectName=${PROJECT_NAME}\"\n --set \"global.clusterName=${CLUSTER_NAME}\"\n --set \"global.env=${ENV}\"\n --set \"global.deployKind=${DEPLOY_KIND}\"\n --set \"random=:$(date)\"\n --set \"app.tag=${TAG}\"\n --set \"ingress.host=${HOST}\"\n --set \"style=${STYLE}\"\n --set \"back.enabled=${BACK_ENABLED}\"\n --set \"ingress.enabled=${INGRESS_ENABLED}\"\n --set \"metrics.enabled=${METRICS_ENABLED}\"\n --set \"worker.enabled=${WORKER_ENABLED}\"\n --set \"bot.enabled=${BOT_ENABLED}\"\n --set \"ingress.rootEnabled=${ROOT_ENABLED}\"").concat(system.configVars
|
|
62
63
|
.filter(function (v) { return v.scopes.includes('back') || v.scopes.includes('ci'); })
|
|
63
64
|
.map(function (v) { return "\n --set \"".concat(v.name, "=${").concat((0, change_case_1.constantCase)(v.name), "}\""); })
|
|
64
65
|
.join(''), "\n --namespace ${NAMESPACE}\n");
|
|
65
66
|
};
|
|
66
67
|
exports.gitlabCiTmpl = gitlabCiTmpl;
|
|
67
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2l0bGFiQ2kuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvcHJvamVjdHNHZW5lcmF0aW9uL2dlbmVyYXRvcnMvZmlsZVRlbXBsYXRlcy9iYWNrL2Vudmlyb25tZW50L2dpdGxhYkNpLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDRCQUE0QjtBQUM1QiwyQ0FBMEM7QUFFMUMsMkNBQW9EO0FBRTdDLElBQU0sWUFBWSxHQUFHLFVBQUMsRUFJRDtRQUhoQixNQUFNLG1CQUFBLEVBQ2hCLE1BQU0sWUFBQSxFQUNOLE9BQU8sYUFBQTtJQUN3QixPQUFBLDBCQUUvQixPQUFPLENBQUMsMEJBQTBCO1FBQ2hDLENBQUMsQ0FBQyxFQUFFO1FBQ0osQ0FBQyxDQUFDLGNBQ0Ysd0JBQWdCLE9BQ25CLHFWQXFCaUIsTUFBTSxDQUFDLElBQUksOFZBZXBCLE1BQU0sQ0FBQyxrQkFBa0I7U0FDN0IsR0FBRyxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsa0JBQVcsQ0FBQyxDQUFDLFVBQVUsQ0FBRSxFQUF6QixDQUF5QixDQUFDLDQ5QkF1QmpDLE1BQU0sQ0FBQyxrQkFBa0I7U0FDM0IsR0FBRyxDQUFDLFVBQUMsQ0FBQyxJQUFLLE9BQUEsa0JBQVcsQ0FBQyxDQUFDLFVBQVUsQ0FBRSxFQUF6QixDQUF5QixDQUFDLHllQXFCMUMsTUFBTSxDQUFDLGtCQUFrQjtTQUN4QixHQUFHLENBQUMsVUFBQyxDQUFDO1FBQ0wsT0FBQSxpQkFBVSxDQUFDLENBQUMsSUFBSSx3Q0FFaEIsQ0FBQyxDQUFDLElBQUksS0FBSyxNQUFNLElBQUksQ0FBQyxDQUFDLElBQUksS0FBSyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSyw4REFJL0MsQ0FBQyxDQUFDLElBQUkscUNBQ0csQ0FBQyxDQUFDLFdBQVcsbUJBRWhDLENBQUMsQ0FBQyxJQUFJLEtBQUssTUFBTSxJQUFJLENBQUMsQ0FBQyxJQUFJ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
|
|
@@ -42,7 +42,8 @@ declare class SystemMetaBuilder {
|
|
|
42
42
|
addLanguage(id: string, title?: string): void;
|
|
43
43
|
deleteLanguage(id: string): void;
|
|
44
44
|
setDefailtLanguage(id: string): void;
|
|
45
|
-
addDeployEnvironment(
|
|
45
|
+
addDeployEnvironment(deployEnvironment: DeployEnvironment): this;
|
|
46
|
+
delDeployEnvironment(name: string): this;
|
|
46
47
|
addTelegramBot(name: string, title?: string): TelegramBotBuilder;
|
|
47
48
|
getCatalogs(): EntityBuilderWithOptions[];
|
|
48
49
|
addCatalog(name: string, title?: {
|
|
@@ -236,8 +236,10 @@ export declare type SumRegistry = BaseSavableEntity & {
|
|
|
236
236
|
};
|
|
237
237
|
export declare type Entity = Document | Catalog | InfoRegistry | SumRegistry;
|
|
238
238
|
export interface DeployEnvironment {
|
|
239
|
+
manualDeploy: boolean;
|
|
239
240
|
name: string;
|
|
240
241
|
clusterName: string;
|
|
242
|
+
branchName: string;
|
|
241
243
|
}
|
|
242
244
|
export declare type Language = {
|
|
243
245
|
id: string;
|