Compare commits
14 Commits
e5bafff815
...
feature/yo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56dda3233a | ||
|
|
2d4487263d | ||
|
|
f1daf34751 | ||
| e106863c75 | |||
|
|
30128ea7c0 | ||
|
|
57552b3cf3 | ||
|
|
5db6974d16 | ||
|
|
77363d0f45 | ||
|
|
dbb1bc3073 | ||
| 7aab555cd2 | |||
| af1ad3227a | |||
|
|
07365df5eb | ||
|
|
8826edfcb6 | ||
|
|
c2095b6d8b |
1
environment/common/.gitignore
vendored
Normal file
1
environment/common/.gitignore
vendored
Normal file
@@ -0,0 +1 @@
|
|||||||
|
.env
|
||||||
255
environment/common/package-lock.json
generated
Normal file
255
environment/common/package-lock.json
generated
Normal file
@@ -0,0 +1,255 @@
|
|||||||
|
{
|
||||||
|
"name": "common",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"lockfileVersion": 3,
|
||||||
|
"requires": true,
|
||||||
|
"packages": {
|
||||||
|
"": {
|
||||||
|
"name": "common",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"license": "ISC",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/js-yaml": "^4.0.9",
|
||||||
|
"@types/node": "^22.15.18",
|
||||||
|
"dotenv": "^16.5.0",
|
||||||
|
"js-yaml": "^4.1.0",
|
||||||
|
"ts-node": "^10.9.2",
|
||||||
|
"typescript": "^5.8.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@cspotcode/source-map-support": {
|
||||||
|
"version": "0.8.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
|
||||||
|
"integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@jridgewell/trace-mapping": "0.3.9"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=12"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@jridgewell/resolve-uri": {
|
||||||
|
"version": "3.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
|
||||||
|
"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=6.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@jridgewell/sourcemap-codec": {
|
||||||
|
"version": "1.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
|
||||||
|
"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@jridgewell/trace-mapping": {
|
||||||
|
"version": "0.3.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
|
||||||
|
"integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@jridgewell/resolve-uri": "^3.0.3",
|
||||||
|
"@jridgewell/sourcemap-codec": "^1.4.10"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@tsconfig/node10": {
|
||||||
|
"version": "1.0.11",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
|
||||||
|
"integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@tsconfig/node12": {
|
||||||
|
"version": "1.0.11",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
|
||||||
|
"integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@tsconfig/node14": {
|
||||||
|
"version": "1.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
|
||||||
|
"integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@tsconfig/node16": {
|
||||||
|
"version": "1.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
|
||||||
|
"integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@types/js-yaml": {
|
||||||
|
"version": "4.0.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
|
||||||
|
"integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/@types/node": {
|
||||||
|
"version": "22.15.18",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.18.tgz",
|
||||||
|
"integrity": "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"undici-types": "~6.21.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/acorn": {
|
||||||
|
"version": "8.14.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.1.tgz",
|
||||||
|
"integrity": "sha512-OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"bin": {
|
||||||
|
"acorn": "bin/acorn"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/acorn-walk": {
|
||||||
|
"version": "8.3.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
|
||||||
|
"integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"acorn": "^8.11.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.4.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/arg": {
|
||||||
|
"version": "4.1.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
|
||||||
|
"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/argparse": {
|
||||||
|
"version": "2.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
|
||||||
|
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
|
||||||
|
"license": "Python-2.0"
|
||||||
|
},
|
||||||
|
"node_modules/create-require": {
|
||||||
|
"version": "1.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
|
||||||
|
"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/diff": {
|
||||||
|
"version": "4.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
|
||||||
|
"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
|
||||||
|
"license": "BSD-3-Clause",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=0.3.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/dotenv": {
|
||||||
|
"version": "16.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
|
||||||
|
"integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
|
||||||
|
"license": "BSD-2-Clause",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=12"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://dotenvx.com"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/js-yaml": {
|
||||||
|
"version": "4.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
||||||
|
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"argparse": "^2.0.1"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"js-yaml": "bin/js-yaml.js"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/make-error": {
|
||||||
|
"version": "1.3.6",
|
||||||
|
"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
|
||||||
|
"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
|
||||||
|
"license": "ISC"
|
||||||
|
},
|
||||||
|
"node_modules/ts-node": {
|
||||||
|
"version": "10.9.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
|
||||||
|
"integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@cspotcode/source-map-support": "^0.8.0",
|
||||||
|
"@tsconfig/node10": "^1.0.7",
|
||||||
|
"@tsconfig/node12": "^1.0.7",
|
||||||
|
"@tsconfig/node14": "^1.0.0",
|
||||||
|
"@tsconfig/node16": "^1.0.2",
|
||||||
|
"acorn": "^8.4.1",
|
||||||
|
"acorn-walk": "^8.1.1",
|
||||||
|
"arg": "^4.1.0",
|
||||||
|
"create-require": "^1.1.0",
|
||||||
|
"diff": "^4.0.1",
|
||||||
|
"make-error": "^1.1.1",
|
||||||
|
"v8-compile-cache-lib": "^3.0.1",
|
||||||
|
"yn": "3.1.1"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"ts-node": "dist/bin.js",
|
||||||
|
"ts-node-cwd": "dist/bin-cwd.js",
|
||||||
|
"ts-node-esm": "dist/bin-esm.js",
|
||||||
|
"ts-node-script": "dist/bin-script.js",
|
||||||
|
"ts-node-transpile-only": "dist/bin-transpile.js",
|
||||||
|
"ts-script": "dist/bin-script-deprecated.js"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@swc/core": ">=1.2.50",
|
||||||
|
"@swc/wasm": ">=1.2.50",
|
||||||
|
"@types/node": "*",
|
||||||
|
"typescript": ">=2.7"
|
||||||
|
},
|
||||||
|
"peerDependenciesMeta": {
|
||||||
|
"@swc/core": {
|
||||||
|
"optional": true
|
||||||
|
},
|
||||||
|
"@swc/wasm": {
|
||||||
|
"optional": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/typescript": {
|
||||||
|
"version": "5.8.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
|
||||||
|
"integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"bin": {
|
||||||
|
"tsc": "bin/tsc",
|
||||||
|
"tsserver": "bin/tsserver"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.17"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/undici-types": {
|
||||||
|
"version": "6.21.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
|
||||||
|
"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/v8-compile-cache-lib": {
|
||||||
|
"version": "3.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
|
||||||
|
"integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
|
"node_modules/yn": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=6"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
19
environment/common/package.json
Normal file
19
environment/common/package.json
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
{
|
||||||
|
"name": "common",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"main": "index.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"description": "",
|
||||||
|
"dependencies": {
|
||||||
|
"@types/js-yaml": "^4.0.9",
|
||||||
|
"@types/node": "^22.15.18",
|
||||||
|
"dotenv": "^16.5.0",
|
||||||
|
"js-yaml": "^4.1.0",
|
||||||
|
"ts-node": "^10.9.2",
|
||||||
|
"typescript": "^5.8.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
28
environment/common/src/update.service.version.ts
Normal file
28
environment/common/src/update.service.version.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
|
||||||
|
import yaml from 'js-yaml'
|
||||||
|
import fs from 'fs';
|
||||||
|
import dotenv from "dotenv"
|
||||||
|
|
||||||
|
dotenv.config()
|
||||||
|
if ( !process.env.TARGET_FILE
|
||||||
|
|| !process.env.TARGET_SERVICE
|
||||||
|
|| !process.env.TARGET_IMAGE ) {
|
||||||
|
console.log("environment variables: TARGET_FILE, TARGET_SERVICE, TARGET_IMAGE are required")
|
||||||
|
process.exit(1)
|
||||||
|
}
|
||||||
|
console.log("Working directory",process.cwd());
|
||||||
|
console.log("TARGET_FILE",process.env.TARGET_FILE);
|
||||||
|
console.log("TARGET_SERVICE",process.env.TARGET_SERVICE);
|
||||||
|
console.log("TARGET_IMAGE",process.env.TARGET_IMAGE);
|
||||||
|
try {
|
||||||
|
console.log("updating service version");
|
||||||
|
const composeFile: any = yaml.load(fs.readFileSync(process.env.TARGET_FILE as string, 'utf8'));
|
||||||
|
console.log("updating image");
|
||||||
|
composeFile.services[process.env.TARGET_SERVICE as string].image = process.env.TARGET_IMAGE;
|
||||||
|
const result = yaml.dump(composeFile);
|
||||||
|
fs.writeFileSync(process.env.TARGET_FILE as string, result)
|
||||||
|
console.log("image updated",process.env.TARGET_FILE,process.env.TARGET_SERVICE,process.env.TARGET_IMAGE);
|
||||||
|
} catch (e) {
|
||||||
|
console.log(e);
|
||||||
|
}
|
||||||
|
|
||||||
113
environment/common/tsconfig.json
Normal file
113
environment/common/tsconfig.json
Normal file
@@ -0,0 +1,113 @@
|
|||||||
|
{
|
||||||
|
"compilerOptions": {
|
||||||
|
/* Visit https://aka.ms/tsconfig to read more about this file */
|
||||||
|
|
||||||
|
/* Projects */
|
||||||
|
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
|
||||||
|
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
|
||||||
|
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
|
||||||
|
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
|
||||||
|
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
|
||||||
|
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
||||||
|
|
||||||
|
/* Language and Environment */
|
||||||
|
"target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
|
||||||
|
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
||||||
|
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
||||||
|
// "libReplacement": true, /* Enable lib replacement. */
|
||||||
|
// "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */
|
||||||
|
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
|
||||||
|
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
|
||||||
|
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
|
||||||
|
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
|
||||||
|
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
|
||||||
|
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
|
||||||
|
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
|
||||||
|
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
|
||||||
|
|
||||||
|
/* Modules */
|
||||||
|
"module": "commonjs", /* Specify what module code is generated. */
|
||||||
|
// "rootDir": "./", /* Specify the root folder within your source files. */
|
||||||
|
// "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */
|
||||||
|
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
|
||||||
|
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
|
||||||
|
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
|
||||||
|
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
|
||||||
|
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
|
||||||
|
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||||
|
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
|
||||||
|
// "allowImportingTsExtensions": true, /* Allow imports to include TypeScript file extensions. Requires '--moduleResolution bundler' and either '--noEmit' or '--emitDeclarationOnly' to be set. */
|
||||||
|
// "rewriteRelativeImportExtensions": true, /* Rewrite '.ts', '.tsx', '.mts', and '.cts' file extensions in relative import paths to their JavaScript equivalent in output files. */
|
||||||
|
// "resolvePackageJsonExports": true, /* Use the package.json 'exports' field when resolving package imports. */
|
||||||
|
// "resolvePackageJsonImports": true, /* Use the package.json 'imports' field when resolving imports. */
|
||||||
|
// "customConditions": [], /* Conditions to set in addition to the resolver-specific defaults when resolving imports. */
|
||||||
|
// "noUncheckedSideEffectImports": true, /* Check side effect imports. */
|
||||||
|
// "resolveJsonModule": true, /* Enable importing .json files. */
|
||||||
|
// "allowArbitraryExtensions": true, /* Enable importing files with any extension, provided a declaration file is present. */
|
||||||
|
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
|
||||||
|
|
||||||
|
/* JavaScript Support */
|
||||||
|
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
|
||||||
|
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
|
||||||
|
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
|
||||||
|
|
||||||
|
/* Emit */
|
||||||
|
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
|
||||||
|
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
|
||||||
|
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
|
||||||
|
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
|
||||||
|
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
|
||||||
|
// "noEmit": true, /* Disable emitting files from a compilation. */
|
||||||
|
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
|
||||||
|
// "outDir": "./", /* Specify an output folder for all emitted files. */
|
||||||
|
// "removeComments": true, /* Disable emitting comments. */
|
||||||
|
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
|
||||||
|
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
|
||||||
|
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
|
||||||
|
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||||
|
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
|
||||||
|
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
|
||||||
|
// "newLine": "crlf", /* Set the newline character for emitting files. */
|
||||||
|
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
|
||||||
|
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
|
||||||
|
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
||||||
|
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
|
||||||
|
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
||||||
|
|
||||||
|
/* Interop Constraints */
|
||||||
|
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
||||||
|
// "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */
|
||||||
|
// "isolatedDeclarations": true, /* Require sufficient annotation on exports so other tools can trivially generate declaration files. */
|
||||||
|
// "erasableSyntaxOnly": true, /* Do not allow runtime constructs that are not part of ECMAScript. */
|
||||||
|
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
|
||||||
|
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
|
||||||
|
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
|
||||||
|
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
|
||||||
|
|
||||||
|
/* Type Checking */
|
||||||
|
"strict": true, /* Enable all strict type-checking options. */
|
||||||
|
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
|
||||||
|
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
|
||||||
|
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
|
||||||
|
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
|
||||||
|
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
|
||||||
|
// "strictBuiltinIteratorReturn": true, /* Built-in iterators are instantiated with a 'TReturn' type of 'undefined' instead of 'any'. */
|
||||||
|
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
|
||||||
|
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
|
||||||
|
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
|
||||||
|
// "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
|
||||||
|
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
|
||||||
|
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
|
||||||
|
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
|
||||||
|
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
|
||||||
|
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
|
||||||
|
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
|
||||||
|
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
|
||||||
|
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
|
||||||
|
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
|
||||||
|
|
||||||
|
/* Completeness */
|
||||||
|
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
|
||||||
|
"skipLibCheck": true /* Skip type checking all .d.ts files. */
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1 +1 @@
|
|||||||
202505132211.cb2b88c
|
202505181151.77363d0
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
202504242104.73ece65
|
202505180959.57552b3
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
services:
|
services:
|
||||||
|
|
||||||
strapi-db:
|
strapi-db:
|
||||||
image: mariadb:11.6.2
|
image: mariadb:11.6.2
|
||||||
environment:
|
environment:
|
||||||
@@ -10,9 +9,7 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- strapi-db:/var/lib/mysql
|
- strapi-db:/var/lib/mysql
|
||||||
networks:
|
networks:
|
||||||
- yogastic
|
- yogastic
|
||||||
|
|
||||||
|
|
||||||
nextjs-db:
|
nextjs-db:
|
||||||
image: postgres:17
|
image: postgres:17
|
||||||
environment:
|
environment:
|
||||||
@@ -22,13 +19,12 @@ services:
|
|||||||
volumes:
|
volumes:
|
||||||
- next-db:/var/lib/postgresql/data
|
- next-db:/var/lib/postgresql/data
|
||||||
networks:
|
networks:
|
||||||
- yogastic
|
- yogastic
|
||||||
|
|
||||||
app:
|
app:
|
||||||
image: docker.rschneider.hu/infra/yoga-app:202504252327.477286f
|
image: docker.rschneider.hu/infra/yoga-app:202505181151.77363d0
|
||||||
platform: linux/amd64
|
platform: linux/amd64
|
||||||
ports:
|
ports:
|
||||||
- "4025:3000"
|
- '4025:3000'
|
||||||
environment:
|
environment:
|
||||||
POSTGRES_URL: ${APP_POSTGRES_URL}
|
POSTGRES_URL: ${APP_POSTGRES_URL}
|
||||||
POSTGRES_URL_NON_POOLING: ${APP_POSTGRES_URL_NON_POOLING}
|
POSTGRES_URL_NON_POOLING: ${APP_POSTGRES_URL_NON_POOLING}
|
||||||
@@ -50,11 +46,10 @@ services:
|
|||||||
networks:
|
networks:
|
||||||
- proxy_shared
|
- proxy_shared
|
||||||
- yogastic
|
- yogastic
|
||||||
|
|
||||||
cms:
|
cms:
|
||||||
image: docker.rschneider.hu/infra/yoga-cms:202504242104.73ece65
|
image: docker.rschneider.hu/infra/yoga-cms:202505180959.57552b3
|
||||||
ports:
|
ports:
|
||||||
- "4026:1337"
|
- '4026:1337'
|
||||||
environment:
|
environment:
|
||||||
DATABASE_CLIENT: mysql
|
DATABASE_CLIENT: mysql
|
||||||
DATABASE_HOST: strapi-db
|
DATABASE_HOST: strapi-db
|
||||||
@@ -64,20 +59,24 @@ services:
|
|||||||
DATABASE_PASSWORD: strapi
|
DATABASE_PASSWORD: strapi
|
||||||
HOST: 0.0.0.0
|
HOST: 0.0.0.0
|
||||||
PORT: 1337
|
PORT: 1337
|
||||||
APP_KEYS: "yoga1,yoga2"
|
APP_KEYS: yoga1,yoga2
|
||||||
API_TOKEN_SALT: diana
|
API_TOKEN_SALT: diana
|
||||||
ADMIN_JWT_SECRET: 6d49a635a298dfff1457002ab1ea26d51f94f6c67c03f7299e8adc19aafe02a2aadb2258aa1be90b836898e0b1ce6970d7584dda32129fb0e4aa09db9ba2076909a44491bbf1c0e1840b8a78843388851ed80407a71fabc3674faca3b4c4fd147c86347a390e86051b1530cac454063bb351632c75852110a5dc198f96a4f4b709d34d240d3e82206f29756a703d7b873b387d7a20e87df71f31a2f934d2a32a3795898c8d43d7f088ebfc8c430b81f4112b811c2aac6be8af551afd8cc29c4875037fd5c7fdacfcd5740b89bab0e1ada51b23f99fb0d181a8ad4758447331edd339ce988e02a6eae170ff57b6650f91dfb2988f7d91be6ea330c0e8fd647799
|
ADMIN_JWT_SECRET: >-
|
||||||
|
6d49a635a298dfff1457002ab1ea26d51f94f6c67c03f7299e8adc19aafe02a2aadb2258aa1be90b836898e0b1ce6970d7584dda32129fb0e4aa09db9ba2076909a44491bbf1c0e1840b8a78843388851ed80407a71fabc3674faca3b4c4fd147c86347a390e86051b1530cac454063bb351632c75852110a5dc198f96a4f4b709d34d240d3e82206f29756a703d7b873b387d7a20e87df71f31a2f934d2a32a3795898c8d43d7f088ebfc8c430b81f4112b811c2aac6be8af551afd8cc29c4875037fd5c7fdacfcd5740b89bab0e1ada51b23f99fb0d181a8ad4758447331edd339ce988e02a6eae170ff57b6650f91dfb2988f7d91be6ea330c0e8fd647799
|
||||||
TRANSFER_TOKEN_SALT: 2209851913
|
TRANSFER_TOKEN_SALT: 2209851913
|
||||||
JWT_SECRET: fc2be7f56eefe9790bd80a3713974620f42a66313f71bb581ac15328b886ccd42c51eb54f6e897b5d3f6d12bec069dfd116eb63f09d709346ab8c5c328ff42cef1f1cd7e39448186c9c96af3d838e25a3e82dfe72578d775f322bfb3b280ee7db103ae768dcebfc3fa0a9fffeb4d4773cd70e818f6cd8e98f360faa926a8388d18a1c9abcb616600c2c450820a29328df5592dea4a76edf3e9f8147cf92fc88a8a9e3f3698e038c9f7ccbfd7fc04fada3583f2ad8d1ff087a6f23cd33cfc8edf82e6489f1470da5dc52bc1ab1ac025bc9f77a6098f5efecff451498e2d936d005284e149971df15ed81d92ddddd0f71b5ffa3584d853aa3cecc37652430e7d27
|
JWT_SECRET: >-
|
||||||
|
fc2be7f56eefe9790bd80a3713974620f42a66313f71bb581ac15328b886ccd42c51eb54f6e897b5d3f6d12bec069dfd116eb63f09d709346ab8c5c328ff42cef1f1cd7e39448186c9c96af3d838e25a3e82dfe72578d775f322bfb3b280ee7db103ae768dcebfc3fa0a9fffeb4d4773cd70e818f6cd8e98f360faa926a8388d18a1c9abcb616600c2c450820a29328df5592dea4a76edf3e9f8147cf92fc88a8a9e3f3698e038c9f7ccbfd7fc04fada3583f2ad8d1ff087a6f23cd33cfc8edf82e6489f1470da5dc52bc1ab1ac025bc9f77a6098f5efecff451498e2d936d005284e149971df15ed81d92ddddd0f71b5ffa3584d853aa3cecc37652430e7d27
|
||||||
networks:
|
networks:
|
||||||
- proxy_shared
|
- proxy_shared
|
||||||
- yogastic
|
- yogastic
|
||||||
|
volumes:
|
||||||
|
- strapi-uploads:/opt/app/public/uploads
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
next-db: {}
|
next-db: {}
|
||||||
strapi-db: {}
|
strapi-db: {}
|
||||||
|
strapi-uploads: {}
|
||||||
networks:
|
networks:
|
||||||
yogastic:
|
yogastic: null
|
||||||
proxy_shared:
|
proxy_shared:
|
||||||
external: true
|
external: true
|
||||||
|
|||||||
2
environment/prod/jenkins/Jenkinsfile
vendored
2
environment/prod/jenkins/Jenkinsfile
vendored
@@ -10,6 +10,8 @@ pipeline {
|
|||||||
cd /home/rocho/projects/yogastic/environment/prod/docker-compose/yogastic
|
cd /home/rocho/projects/yogastic/environment/prod/docker-compose/yogastic
|
||||||
docker compose down
|
docker compose down
|
||||||
docker compose up -d
|
docker compose up -d
|
||||||
|
cd /home/rocho/docker/proxy/proxy
|
||||||
|
bash ./restart.sh
|
||||||
''', execTimeout: 120000,
|
''', execTimeout: 120000,
|
||||||
flatten: false,
|
flatten: false,
|
||||||
makeEmptyDirs: false,
|
makeEmptyDirs: false,
|
||||||
|
|||||||
221
environment/prod/jenkins/update.versions.Jenkinsfile
Normal file
221
environment/prod/jenkins/update.versions.Jenkinsfile
Normal file
@@ -0,0 +1,221 @@
|
|||||||
|
pipeline {
|
||||||
|
agent any
|
||||||
|
|
||||||
|
environment {
|
||||||
|
|
||||||
|
DOCKER_CREDS = 'rschneider@docker.rschneider.hu'
|
||||||
|
GIT_USER = "Roland Schneider"
|
||||||
|
GIT_EMAIL = "rocho02@gmail.com"
|
||||||
|
GIT_REPO = "gitea.rschneider.hu/rschneider/yogastic.git"
|
||||||
|
GIT_BRANCH = "main"
|
||||||
|
GIT_CREDS_ID = "rschneider_gitea.rschneider.hu"
|
||||||
|
CMS_IMAGE= "docker.rschneider.hu/infra/yoga-cms"
|
||||||
|
APP_IMAGE= "docker.rschneider.hu/infra/yoga-app"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Checkout') {
|
||||||
|
steps {
|
||||||
|
|
||||||
|
git branch: 'main', credentialsId: "${GIT_CREDS_ID}", url: "https://${GIT_REPO}"
|
||||||
|
sh '''
|
||||||
|
ls -lah
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Collect project info - cms') {
|
||||||
|
agent{
|
||||||
|
docker {
|
||||||
|
reuseNode true
|
||||||
|
image 'linuxserver/yq'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
withCredentials([usernamePassword(credentialsId: "${GIT_CREDS_ID}", passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) {
|
||||||
|
|
||||||
|
script {
|
||||||
|
def block = ""
|
||||||
|
|
||||||
|
block = sh returnStdout:true, script:'''
|
||||||
|
yq -y '.services.cms.image' environment/prod/docker-compose/yogastic/docker-compose.yaml
|
||||||
|
|
||||||
|
'''
|
||||||
|
block = block.readLines();
|
||||||
|
env.CMS_CURRENT = block[0];
|
||||||
|
|
||||||
|
block = sh returnStdout:true, script:'''
|
||||||
|
cat environment/dev/docker/cms/scripts/version.txt
|
||||||
|
'''
|
||||||
|
block = block.readLines();
|
||||||
|
env.CMS_LATEST = block[0];
|
||||||
|
|
||||||
|
def apiUrl = "https://docker.rschneider.hu/v2/infra/yoga-cms/tags/list"
|
||||||
|
def tagsResponse = sh(script: """
|
||||||
|
curl -s -u "${DOCKER_USERNAME}:${DOCKER_PASSWORD}" ${apiUrl}
|
||||||
|
""", returnStdout: true).trim()
|
||||||
|
// Step 3: Use JsonSlurper to parse the JSON response
|
||||||
|
def jsonSlurper = new groovy.json.JsonSlurper()
|
||||||
|
def tags = jsonSlurper.parseText(tagsResponse)
|
||||||
|
// Extract the tag names
|
||||||
|
def availableTags = tags.tags.collect { it }
|
||||||
|
availableTags = availableTags.reverse()
|
||||||
|
println availableTags
|
||||||
|
env.CMS_TAGS = availableTags.join("\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Collect project info - app') {
|
||||||
|
agent{
|
||||||
|
docker {
|
||||||
|
reuseNode true
|
||||||
|
image 'linuxserver/yq'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
withCredentials([usernamePassword(credentialsId: 'rschneider@docker.rschneider.hu', passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USERNAME')]) {
|
||||||
|
|
||||||
|
script {
|
||||||
|
def block = ""
|
||||||
|
|
||||||
|
block = sh returnStdout:true, script:'''
|
||||||
|
yq -y '.services.app.image' environment/prod/docker-compose/yogastic/docker-compose.yaml
|
||||||
|
|
||||||
|
'''
|
||||||
|
block = block.readLines();
|
||||||
|
env.APP_CURRENT = block[0];
|
||||||
|
|
||||||
|
block = sh returnStdout:true, script:'''
|
||||||
|
cat environment/dev/docker/app/scripts/version.txt
|
||||||
|
'''
|
||||||
|
block = block.readLines();
|
||||||
|
env.APP_LATEST = block[0];
|
||||||
|
|
||||||
|
def apiUrl = "https://docker.rschneider.hu/v2/infra/yoga-app/tags/list"
|
||||||
|
def tagsResponse = sh(script: """
|
||||||
|
curl -s -u "${DOCKER_USERNAME}:${DOCKER_PASSWORD}" ${apiUrl}
|
||||||
|
""", returnStdout: true).trim()
|
||||||
|
// Step 3: Use JsonSlurper to parse the JSON response
|
||||||
|
def jsonSlurper = new groovy.json.JsonSlurper()
|
||||||
|
def tags = jsonSlurper.parseText(tagsResponse)
|
||||||
|
// Extract the tag names
|
||||||
|
def availableTags = tags.tags.collect { it }
|
||||||
|
availableTags = availableTags.reverse()
|
||||||
|
|
||||||
|
env.APP_TAGS = availableTags.join("\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
stage('Select version CMS') {
|
||||||
|
steps {
|
||||||
|
echo "new tags"
|
||||||
|
println env.CMS_TAGS
|
||||||
|
script{
|
||||||
|
env.CMS_VERSION = input message: 'Select version for PROD', ok: 'Update',
|
||||||
|
parameters: [choice(name: 'Select version', choices: env.CMS_TAGS, description: """
|
||||||
|
Latest: ${env.CMS_LATEST}
|
||||||
|
Current: ${env.CMS_CURRENT}
|
||||||
|
""" )]
|
||||||
|
echo "You have selected Docker Tag: ${env.CMS_VERSION}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Select version APP') {
|
||||||
|
steps {
|
||||||
|
echo "new APP tags"
|
||||||
|
println env.APP_TAGS
|
||||||
|
script{
|
||||||
|
env.APP_VERSION = input message: 'Select version for PROD', ok: 'Update',
|
||||||
|
parameters: [choice(name: 'Select version', choices: env.APP_TAGS, description: """
|
||||||
|
Latest: ${env.APP_LATEST}
|
||||||
|
Current: ${env.APP_CURRENT}
|
||||||
|
""")]
|
||||||
|
echo "You have selected Docker Tag: ${env.APP_VERSION}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Update version CMS') {
|
||||||
|
agent{
|
||||||
|
docker {
|
||||||
|
reuseNode true
|
||||||
|
image 'node:22'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
script{
|
||||||
|
|
||||||
|
env.TARGET_FILE='../prod/docker-compose/yogastic/docker-compose.yaml'
|
||||||
|
env.TARGET_SERVICE='cms'
|
||||||
|
env.TARGET_IMAGE= "${CMS_IMAGE}:${CMS_VERSION}"
|
||||||
|
|
||||||
|
sh '''
|
||||||
|
cd environment/common
|
||||||
|
npm i -c
|
||||||
|
npx ts-node src/update.service.version.ts
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Update version APP') {
|
||||||
|
agent{
|
||||||
|
docker {
|
||||||
|
reuseNode true
|
||||||
|
image 'node:22'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
script{
|
||||||
|
|
||||||
|
env.TARGET_FILE='../prod/docker-compose/yogastic/docker-compose.yaml'
|
||||||
|
env.TARGET_SERVICE='app'
|
||||||
|
env.TARGET_IMAGE= "${APP_IMAGE}:${APP_VERSION}"
|
||||||
|
|
||||||
|
sh '''
|
||||||
|
cd environment/common
|
||||||
|
npm i -c
|
||||||
|
npx ts-node src/update.service.version.ts
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
stage('Update git ') {
|
||||||
|
/*
|
||||||
|
agent{
|
||||||
|
docker {
|
||||||
|
reuseNode true
|
||||||
|
image 'alpine/git'
|
||||||
|
args '--entrypoint /bin/sh'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
environment{
|
||||||
|
GIT_CREDS = credentials("${GIT_CREDS_ID}")
|
||||||
|
ENV_NAME = "Prod yoga-app"
|
||||||
|
IMAGE_VERSION = "${CMS_VERSION}"
|
||||||
|
}
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
git status
|
||||||
|
git config user.email "${GIT_EMAIL}"
|
||||||
|
git config user.name "${GIT_USER}"
|
||||||
|
git commit -a -m "[ci-skip] New ${ENV_NAME} deployment version: ${IMAGE_VERSION}"
|
||||||
|
git push --tags https://$GIT_CREDS@$GIT_REPO $GIT_BRANCH
|
||||||
|
|
||||||
|
'''
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
6
yoga-app/src/app/services/[slug]/page.tsx
Normal file
6
yoga-app/src/app/services/[slug]/page.tsx
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
|
||||||
|
export default async function ServiceDetails() {
|
||||||
|
return (
|
||||||
|
<h1>hello </h1>
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1,32 +1,32 @@
|
|||||||
.serviceSlide{
|
/*.serviceSlide{*/
|
||||||
|
|
||||||
}
|
/*}*/
|
||||||
|
|
||||||
button:first-of-type{
|
/*button.slick-arrow:first-of-type{*/
|
||||||
left: 6px;
|
/* left: 6px;*/
|
||||||
z-index: 1;
|
/* z-index: 1;*/
|
||||||
}
|
/*}*/
|
||||||
|
|
||||||
button:last-of-type{
|
/*button.slick-arrow:last-of-type{*/
|
||||||
right: 6px;
|
/* right: 6px;*/
|
||||||
}
|
/*}*/
|
||||||
|
|
||||||
.serviceSlide{
|
.serviceSlide{
|
||||||
margin: 0 6px;
|
margin: 0 6px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
:global(.slick-active){
|
.slick-track :global(.slick-active){
|
||||||
padding-left: 3px;
|
padding-left: 3px;
|
||||||
padding-right: 3px;
|
padding-right: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
:global(div:nth-child(1 of .slick-active)){
|
.slick-track :global(div:nth-child(1 of .slick-active)){
|
||||||
padding-left: 0;
|
padding-left: 0;
|
||||||
padding-right: 3px;
|
padding-right: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
:global(div:nth-last-child(1 of .slick-active)){
|
.slick-track :global(div:nth-last-child(1 of .slick-active)){
|
||||||
padding-left: 3px;
|
padding-left: 3px;
|
||||||
padding-right: 0;
|
padding-right: 0;
|
||||||
}
|
}
|
||||||
@@ -34,4 +34,4 @@ button:last-of-type{
|
|||||||
/*:global(div.slick-active):nth-last-child(n!*){*/
|
/*:global(div.slick-active):nth-last-child(n!*){*/
|
||||||
/* padding-left: 6px;*/
|
/* padding-left: 6px;*/
|
||||||
/* padding-right: 0;*!*/
|
/* padding-right: 0;*!*/
|
||||||
/*}*/
|
/*}*/
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ export interface YogaSingleService {
|
|||||||
image?: { data: Media };
|
image?: { data: Media };
|
||||||
imageAlt?: string;
|
imageAlt?: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
|
article?: string;
|
||||||
locale: string;
|
locale: string;
|
||||||
localizations?: { data: YogaSingleService[] };
|
localizations?: { data: YogaSingleService[] };
|
||||||
};
|
};
|
||||||
@@ -25,6 +26,7 @@ export interface YogaSingleService_Plain {
|
|||||||
image?: Media_Plain;
|
image?: Media_Plain;
|
||||||
imageAlt?: string;
|
imageAlt?: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
|
article?: string;
|
||||||
locale: string;
|
locale: string;
|
||||||
localizations?: YogaSingleService_Plain[];
|
localizations?: YogaSingleService_Plain[];
|
||||||
}
|
}
|
||||||
@@ -37,6 +39,7 @@ export interface YogaSingleService_NoRelations {
|
|||||||
image?: number;
|
image?: number;
|
||||||
imageAlt?: string;
|
imageAlt?: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
|
article?: string;
|
||||||
locale: string;
|
locale: string;
|
||||||
localizations?: YogaSingleService[];
|
localizations?: YogaSingleService[];
|
||||||
}
|
}
|
||||||
@@ -49,6 +52,7 @@ export interface YogaSingleService_AdminPanelLifeCycle {
|
|||||||
image?: AdminPanelRelationPropertyModification<Media_Plain>;
|
image?: AdminPanelRelationPropertyModification<Media_Plain>;
|
||||||
imageAlt?: string;
|
imageAlt?: string;
|
||||||
name?: string;
|
name?: string;
|
||||||
|
article?: string;
|
||||||
locale: string;
|
locale: string;
|
||||||
localizations?: YogaSingleService[];
|
localizations?: YogaSingleService[];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,8 @@
|
|||||||
"info": {
|
"info": {
|
||||||
"singularName": "yoga-single-service",
|
"singularName": "yoga-single-service",
|
||||||
"pluralName": "yoga-single-services",
|
"pluralName": "yoga-single-services",
|
||||||
"displayName": "YogaSingleService"
|
"displayName": "YogaSingleService",
|
||||||
|
"description": ""
|
||||||
},
|
},
|
||||||
"options": {
|
"options": {
|
||||||
"draftAndPublish": true
|
"draftAndPublish": true
|
||||||
@@ -40,14 +41,15 @@
|
|||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"image": {
|
"image": {
|
||||||
|
"type": "media",
|
||||||
|
"multiple": false,
|
||||||
|
"required": false,
|
||||||
"allowedTypes": [
|
"allowedTypes": [
|
||||||
"images",
|
"images",
|
||||||
"files",
|
"files",
|
||||||
"videos",
|
"videos",
|
||||||
"audios"
|
"audios"
|
||||||
],
|
],
|
||||||
"type": "media",
|
|
||||||
"multiple": false,
|
|
||||||
"pluginOptions": {
|
"pluginOptions": {
|
||||||
"i18n": {
|
"i18n": {
|
||||||
"localized": true
|
"localized": true
|
||||||
@@ -69,6 +71,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"type": "string"
|
"type": "string"
|
||||||
|
},
|
||||||
|
"article": {
|
||||||
|
"type": "richtext"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
2
yoga-cms/types/generated/contentTypes.d.ts
vendored
2
yoga-cms/types/generated/contentTypes.d.ts
vendored
@@ -1677,6 +1677,7 @@ export interface ApiYogaSingleServiceYogaSingleService
|
|||||||
extends Struct.CollectionTypeSchema {
|
extends Struct.CollectionTypeSchema {
|
||||||
collectionName: 'yoga_single_services';
|
collectionName: 'yoga_single_services';
|
||||||
info: {
|
info: {
|
||||||
|
description: '';
|
||||||
displayName: 'YogaSingleService';
|
displayName: 'YogaSingleService';
|
||||||
pluralName: 'yoga-single-services';
|
pluralName: 'yoga-single-services';
|
||||||
singularName: 'yoga-single-service';
|
singularName: 'yoga-single-service';
|
||||||
@@ -1690,6 +1691,7 @@ export interface ApiYogaSingleServiceYogaSingleService
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
attributes: {
|
attributes: {
|
||||||
|
article: Schema.Attribute.RichText;
|
||||||
buttonLink: Schema.Attribute.String &
|
buttonLink: Schema.Attribute.String &
|
||||||
Schema.Attribute.SetPluginOptions<{
|
Schema.Attribute.SetPluginOptions<{
|
||||||
i18n: {
|
i18n: {
|
||||||
|
|||||||
Reference in New Issue
Block a user