@platforma-sdk/bootstrap 1.21.1 → 1.22.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.
@@ -1,23 +1,23 @@
1
- name: "platforma-s3"
1
+ name: "platforma"
2
2
 
3
3
  services:
4
4
  minio:
5
- image: quay.io/minio/minio
5
+ image: ${MINIO_IMAGE}
6
6
  command: server /data --address "0.0.0.0:9000" --console-address "0.0.0.0:9001"
7
+
7
8
  ports:
8
9
  - "${MINIO_PORT:-9000}:9000"
9
10
  - "${MINIO_CONSOLE_PORT:-9001}:9001"
11
+
10
12
  environment:
11
13
  MINIO_ROOT_USER: testuser
12
14
  MINIO_ROOT_PASSWORD: testpassword
13
15
 
14
16
  volumes:
15
- - primary:/data
17
+ - "${MINIO_STORAGE}:/data"
16
18
 
17
19
  backend:
18
20
  image: ${PL_IMAGE}
19
- depends_on:
20
- - minio
21
21
  ports:
22
22
  - ${PL_GRPC_PORT:-6345}:6345
23
23
  - ${PL_MONITORING_PORT:-9090}:9090
@@ -47,7 +47,7 @@ services:
47
47
 
48
48
  # Logging
49
49
  - "PL_LOG_LEVEL=${PL_LOG_LEVEL:-warn}"
50
- - "PL_LOG_DESTINATION=${PL_LOG_DESTINATION:-stdout}"
50
+ - "PL_LOG_DESTINATION=${PL_LOG_DESTINATION:-/var/log/platforma.log}"
51
51
  - "PL_LOG_COMMIT_SUMMARY=${PL_LOG_COMMIT_SUMMARY:-false}"
52
52
  - "PL_LOG_RESOURCE_DATA=${PL_LOG_RESOURCE_DATA:-false}"
53
53
 
@@ -78,12 +78,14 @@ services:
78
78
  - "PL_DATA_LIBRARY_S3_SECRET=${PL_DATA_PRIMARY_S3_SECRET:-static:testpassword}"
79
79
 
80
80
  volumes:
81
- - ${PL_AUTH_HTPASSWD_PATH}:/etc/platforma/users.htpasswd
82
- - library:/storage/controllers/data/library
83
- - work:/storage/controllers/data/work
84
- - packages:/storage/controllers/packageLoader
85
- - db:/storage/rocksdb
81
+ - ${PL_AUTH_HTPASSWD_PATHL-/dev/null}:/etc/platforma/users.htpasswd
86
82
  - ${PL_LICENSE_FILE:-/dev/null}:/storage/mi.license
83
+ - ${PL_LOG_FILE:-/dev/null}:/var/log/platforma.log
84
+ - ${PL_DATA_DB_ROOT}:/storage/rocksdb
85
+ - ${PL_DATA_PRIMARY_ROOT}:/storage/controllers/data/primary
86
+ - ${PL_DATA_LIBRARY_ROOT}:/storage/controllers/data/library
87
+ - ${PL_DATA_WORKDIR_ROOT}:/storage/controllers/data/work
88
+ - ${PL_DATA_PACKAGE_ROOT}:/storage/controllers/packageLoader
87
89
 
88
90
  restart: always
89
91
 
@@ -9,8 +9,7 @@ export default class S3 extends Command {
9
9
  'auth-enabled': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
10
10
  license: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
11
11
  'license-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
12
- 'storage-library': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
13
- 'storage-primary': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
12
+ storage: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
14
13
  version: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
15
14
  image: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
16
15
  'grpc-port': import("@oclif/core/lib/interfaces").OptionFlag<number, import("@oclif/core/lib/interfaces").CustomOptions>;
@@ -26,10 +26,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
+ const path_1 = __importDefault(require("path"));
29
30
  const core_1 = require("@oclif/core");
30
31
  const core_2 = __importDefault(require("../../../core"));
31
32
  const cmdOpts = __importStar(require("../../../cmd-opts"));
32
33
  const util = __importStar(require("../../../util"));
34
+ const state_1 = __importDefault(require("../../../state"));
33
35
  class S3 extends core_1.Command {
34
36
  static description = "Run platforma backend service with 'S3' primary storage type";
35
37
  static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -38,8 +40,7 @@ class S3 extends core_1.Command {
38
40
  ...cmdOpts.AddressesFlags,
39
41
  ...cmdOpts.ImageFlag,
40
42
  ...cmdOpts.VersionFlag,
41
- ...cmdOpts.StoragePrimaryURLFlag,
42
- ...cmdOpts.StorageLibraryURLFlag,
43
+ ...cmdOpts.StorageFlag,
43
44
  ...cmdOpts.LicenseFlags,
44
45
  ...cmdOpts.AuthFlags
45
46
  };
@@ -55,13 +56,12 @@ class S3 extends core_1.Command {
55
56
  drivers: core.initAuthDriversList(flags, '.')
56
57
  }
57
58
  : undefined;
58
- core.startDockerS3({
59
+ const storage = flags.storage ? path_1.default.join('.', flags.storage) : state_1.default.path('data', 'docker-s3');
60
+ core.startDockerS3(storage, {
59
61
  image: flags.image,
60
62
  version: flags.version,
61
63
  license: flags['license'],
62
64
  licenseFile: flags['license-file'],
63
- primaryURL: flags['storage-primary'],
64
- libraryURL: flags['storage-library'],
65
65
  auth: authOptions,
66
66
  'grpc-port': flags['grpc-port'],
67
67
  'debug-port': flags['debug-port'],
@@ -1 +1 @@
1
- {"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/commands/start/docker/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sCAAsC;AACtC,yDAAiC;AACjC,2DAA6C;AAC7C,oDAAsC;AAGtC,MAAqB,EAAG,SAAQ,cAAO;IACrC,MAAM,CAAU,WAAW,GAAG,8DAA8D,CAAC;IAE7F,MAAM,CAAU,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAEnE,MAAM,CAAU,KAAK,GAAG;QACtB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,cAAc;QACzB,GAAG,OAAO,CAAC,SAAS;QACpB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,qBAAqB;QAChC,GAAG,OAAO,CAAC,qBAAqB;QAEhC,GAAG,OAAO,CAAC,YAAY;QACvB,GAAG,OAAO,CAAC,SAAS;KACrB,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE7B,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAkC,WAAW;YAC5D,CAAC,CAAC;gBACE,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC;aAC9C;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,aAAa,CAAC;YACjB,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YAEtB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;YACzB,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;YAElC,UAAU,EAAE,KAAK,CAAC,iBAAiB,CAAC;YACpC,UAAU,EAAE,KAAK,CAAC,iBAAiB,CAAC;YAEpC,IAAI,EAAE,WAAW;YAEjB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;YAC/B,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC;YACjC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;;AAlDH,qBAmDC"}
1
+ {"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/commands/start/docker/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,sCAAsC;AACtC,yDAAiC;AACjC,2DAA6C;AAC7C,oDAAsC;AAEtC,2DAAmC;AAEnC,MAAqB,EAAG,SAAQ,cAAO;IACrC,MAAM,CAAU,WAAW,GAAG,8DAA8D,CAAC;IAE7F,MAAM,CAAU,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAEnE,MAAM,CAAU,KAAK,GAAG;QACtB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,cAAc;QACzB,GAAG,OAAO,CAAC,SAAS;QACpB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,YAAY;QACvB,GAAG,OAAO,CAAC,SAAS;KACrB,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE7B,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAkC,WAAW;YAC5D,CAAC,CAAC;gBACE,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC;aAC9C;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAEhG,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YAC1B,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YAEtB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;YACzB,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;YAElC,IAAI,EAAE,WAAW;YAEjB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;YAC/B,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC;YACjC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;;AAhDH,qBAiDC"}
@@ -1,10 +1,12 @@
1
1
  import { Command } from '@oclif/core';
2
- export default class FS extends Command {
2
+ export default class Docker extends Command {
3
3
  static description: string;
4
4
  static examples: string[];
5
5
  static flags: {
6
- 'storage-primary': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
6
+ 'storage-library': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
7
7
  'storage-work': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
8
+ 'storage-primary': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
9
+ storage: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
8
10
  license: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
9
11
  'license-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
10
12
  'auth-ldap-default-dn': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
@@ -26,11 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
+ const path_1 = __importDefault(require("path"));
29
30
  const core_1 = require("@oclif/core");
30
- const core_2 = __importDefault(require("../../../core"));
31
- const cmdOpts = __importStar(require("../../../cmd-opts"));
32
- const util = __importStar(require("../../../util"));
33
- class FS extends core_1.Command {
31
+ const core_2 = __importDefault(require("../../core"));
32
+ const cmdOpts = __importStar(require("../../cmd-opts"));
33
+ const util = __importStar(require("../../util"));
34
+ const state_1 = __importDefault(require("../../state"));
35
+ class Docker extends core_1.Command {
34
36
  static description = "Run platforma backend service with 'FS' primary storage type";
35
37
  static examples = ['<%= config.bin %> <%= command.id %>'];
36
38
  static flags = {
@@ -40,12 +42,13 @@ class FS extends core_1.Command {
40
42
  ...cmdOpts.VersionFlag,
41
43
  ...cmdOpts.AuthFlags,
42
44
  ...cmdOpts.LicenseFlags,
43
- ...cmdOpts.StoragePrimaryPathFlag,
45
+ ...cmdOpts.StorageFlag,
46
+ ...cmdOpts.StoragePrimaryURLFlag,
44
47
  ...cmdOpts.StorageWorkPathFlag,
45
- ...cmdOpts.StorageLibraryPathFlag
48
+ ...cmdOpts.StorageLibraryURLFlag
46
49
  };
47
50
  async run() {
48
- const { flags } = await this.parse(FS);
51
+ const { flags } = await this.parse(Docker);
49
52
  const logger = util.createLogger(flags['log-level']);
50
53
  const core = new core_2.default(logger);
51
54
  core.mergeLicenseEnvs(flags);
@@ -56,10 +59,11 @@ class FS extends core_1.Command {
56
59
  drivers: core.initAuthDriversList(flags, '.')
57
60
  }
58
61
  : undefined;
59
- core.startDockerFS({
60
- primaryStorage: flags['storage-primary'],
61
- workStorage: flags['storage-work'],
62
- libraryStorage: flags['storage-library'],
62
+ const storage = flags.storage ? path_1.default.join('.', flags.storage) : state_1.default.path('data', 'docker');
63
+ core.startDocker(storage, {
64
+ primaryStorageURL: flags['storage-primary'],
65
+ workStoragePath: flags['storage-work'],
66
+ libraryStorageURL: flags['storage-library'],
63
67
  image: flags.image,
64
68
  version: flags.version,
65
69
  license: flags['license'],
@@ -71,5 +75,5 @@ class FS extends core_1.Command {
71
75
  });
72
76
  }
73
77
  }
74
- exports.default = FS;
75
- //# sourceMappingURL=fs.js.map
78
+ exports.default = Docker;
79
+ //# sourceMappingURL=docker.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"docker.js","sourceRoot":"","sources":["../../../src/commands/start/docker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,sCAAsC;AACtC,sDAA8B;AAC9B,wDAA0C;AAC1C,iDAAmC;AAEnC,wDAAgC;AAEhC,MAAqB,MAAO,SAAQ,cAAO;IACzC,MAAM,CAAU,WAAW,GAAG,8DAA8D,CAAC;IAE7F,MAAM,CAAU,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAEnE,MAAM,CAAU,KAAK,GAAG;QACtB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,cAAc;QACzB,GAAG,OAAO,CAAC,SAAS;QACpB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,SAAS;QACpB,GAAG,OAAO,CAAC,YAAY;QAEvB,GAAG,OAAO,CAAC,WAAW;QACtB,GAAG,OAAO,CAAC,qBAAqB;QAChC,GAAG,OAAO,CAAC,mBAAmB;QAC9B,GAAG,OAAO,CAAC,qBAAqB;KACjC,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAE3C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE7B,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,CAAC;QAC1C,MAAM,WAAW,GAAkC,WAAW;YAC5D,CAAC,CAAC;gBACE,OAAO,EAAE,WAAW;gBACpB,OAAO,EAAE,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,GAAG,CAAC;aAC9C;YACH,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAE7F,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE;YACxB,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC;YAC3C,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC;YACtC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC;YAE3C,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YAEtB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC;YACzB,WAAW,EAAE,KAAK,CAAC,cAAc,CAAC;YAElC,IAAI,EAAE,WAAW;YAEjB,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;YAC/B,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC;YACjC,iBAAiB,EAAE,KAAK,CAAC,iBAAiB,CAAC;SAC5C,CAAC,CAAC;IACL,CAAC;;AAtDH,yBAuDC"}
@@ -9,9 +9,7 @@ export default class S3 extends Command {
9
9
  'auth-enabled': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
10
10
  "pl-workdir": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
11
11
  "pl-log-file": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
12
- 'storage-library': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
13
12
  'storage-work': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
14
- 'storage-primary': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
15
13
  storage: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
16
14
  license: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
17
15
  'license-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
@@ -26,12 +26,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- const core_1 = require("@oclif/core");
30
29
  const path_1 = __importDefault(require("path"));
30
+ const core_1 = require("@oclif/core");
31
31
  const core_2 = __importDefault(require("../../../core"));
32
32
  const cmdOpts = __importStar(require("../../../cmd-opts"));
33
33
  const platforma = __importStar(require("../../../platforma"));
34
34
  const util = __importStar(require("../../../util"));
35
+ const state_1 = __importDefault(require("../../../state"));
35
36
  class S3 extends core_1.Command {
36
37
  static description = 'Run Platforma Backend service as local process on current host (no docker container)';
37
38
  static examples = ['<%= config.bin %> <%= command.id %>'];
@@ -45,9 +46,7 @@ class S3 extends core_1.Command {
45
46
  ...cmdOpts.ConfigFlag,
46
47
  ...cmdOpts.LicenseFlags,
47
48
  ...cmdOpts.StorageFlag,
48
- ...cmdOpts.StoragePrimaryURLFlag,
49
49
  ...cmdOpts.StorageWorkPathFlag,
50
- ...cmdOpts.StorageLibraryURLFlag,
51
50
  ...cmdOpts.PlLogFileFlag,
52
51
  ...cmdOpts.PlWorkdirFlag,
53
52
  ...cmdOpts.AuthFlags
@@ -58,8 +57,8 @@ class S3 extends core_1.Command {
58
57
  const core = new core_2.default(logger);
59
58
  core.mergeLicenseEnvs(flags);
60
59
  const workdir = flags['pl-workdir'] ?? '.';
61
- const storage = flags.storage ? path_1.default.resolve(workdir, flags.storage) : undefined;
62
- const logFile = flags['pl-log-file'] ? path_1.default.resolve(workdir, flags['pl-log-file']) : 'stdout';
60
+ const storage = flags.storage ? path_1.default.join(workdir, flags.storage) : state_1.default.path('data', 'local-s3');
61
+ const logFile = flags['pl-log-file'] ? path_1.default.join(workdir, flags['pl-log-file']) : undefined;
63
62
  const authDrivers = core.initAuthDriversList(flags, workdir);
64
63
  const authEnabled = flags['auth-enabled'] ?? authDrivers !== undefined;
65
64
  var binaryPath = flags['pl-binary'];
@@ -71,8 +70,6 @@ class S3 extends core_1.Command {
71
70
  version: flags.version,
72
71
  configPath: flags.config,
73
72
  workdir: flags['pl-workdir'],
74
- primaryURL: flags['storage-primary'],
75
- libraryURL: flags['storage-library'],
76
73
  minioPort: flags['s3-address-port'],
77
74
  minioConsolePort: flags['s3-console-address-port'],
78
75
  configOptions: {
@@ -1 +1 @@
1
- {"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/commands/start/local/s3.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"s3.js","sourceRoot":"","sources":["../../../../src/commands/start/local/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,sCAAsC;AACtC,yDAA0D;AAC1D,2DAA6C;AAC7C,8DAAgD;AAChD,oDAAsC;AACtC,2DAAmC;AAEnC,MAAqB,EAAG,SAAQ,cAAO;IACrC,MAAM,CAAU,WAAW,GAAG,sFAAsF,CAAC;IAErH,MAAM,CAAU,QAAQ,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAEnE,MAAM,CAAU,KAAK,GAAG;QACtB,GAAG,OAAO,CAAC,WAAW;QACtB,GAAG,OAAO,CAAC,WAAW;QAEtB,GAAG,OAAO,CAAC,cAAc;QACzB,GAAG,OAAO,CAAC,gBAAgB;QAC3B,GAAG,OAAO,CAAC,YAAY;QACvB,GAAG,OAAO,CAAC,aAAa;QAExB,GAAG,OAAO,CAAC,UAAU;QAErB,GAAG,OAAO,CAAC,YAAY;QAEvB,GAAG,OAAO,CAAC,WAAW;QACtB,GAAG,OAAO,CAAC,mBAAmB;QAE9B,GAAG,OAAO,CAAC,aAAa;QACxB,GAAG,OAAO,CAAC,aAAa;QACxB,GAAG,OAAO,CAAC,SAAS;KACrB,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAEvC,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACrD,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAE7B,MAAM,OAAO,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,GAAG,CAAC;QAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,eAAK,CAAC,IAAI,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACnG,MAAM,OAAO,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAE5F,MAAM,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAC7D,MAAM,WAAW,GAAG,KAAK,CAAC,cAAc,CAAC,IAAI,WAAW,KAAK,SAAS,CAAC;QAEvE,IAAI,UAAU,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;QACpC,IAAI,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC;YACxB,UAAU,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;QACtE,CAAC;QAED,MAAM,YAAY,GAAwB;YACxC,UAAU,EAAE,UAAU;YACtB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,UAAU,EAAE,KAAK,CAAC,MAAM;YACxB,OAAO,EAAE,KAAK,CAAC,YAAY,CAAC;YAE5B,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC;YACnC,gBAAgB,EAAE,KAAK,CAAC,yBAAyB,CAAC;YAElD,aAAa,EAAE;gBACb,IAAI,EAAE,EAAE,MAAM,EAAE,aAAa,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE;gBACnD,UAAU,EAAE,EAAE,MAAM,EAAE,aAAa,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE;gBAC/D,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,KAAK,CAAC,YAAY,CAAC,EAAE,EAAE;gBACrD,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,cAAc,CAAC,EAAE;gBACjE,GAAG,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE;gBACtB,SAAS,EAAE,OAAO;gBAClB,IAAI,EAAE;oBACJ,IAAI,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,WAAW,EAAE;iBACrD;gBACD,QAAQ,EAAE;oBACR,IAAI,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,CAAC,cAAc,CAAC,EAAE;iBACtD;aACF;SACF,CAAC;QAEF,IAAI,YAAY,CAAC,UAAU,EAAE,CAAC;YAC5B,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,SAAS;iBACN,SAAS,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC;iBAC7C,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC;iBAC3C,KAAK,CAAC,UAAU,GAAU;gBACzB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACP,CAAC;IACH,CAAC;;AAhFH,qBAiFC"}
@@ -1,5 +1,5 @@
1
1
  import { Command } from '@oclif/core';
2
- export default class FS extends Command {
2
+ export default class Local extends Command {
3
3
  static description: string;
4
4
  static examples: string[];
5
5
  static flags: {
@@ -9,8 +9,9 @@ export default class FS extends Command {
9
9
  'auth-enabled': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
10
10
  "pl-workdir": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
11
11
  "pl-log-file": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
12
- 'storage-primary': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
12
+ 'storage-library': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
13
13
  'storage-work': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
14
+ 'storage-primary': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
14
15
  storage: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
15
16
  license: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
16
17
  'license-file': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
@@ -28,11 +28,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
29
  const core_1 = require("@oclif/core");
30
30
  const path_1 = __importDefault(require("path"));
31
- const core_2 = __importDefault(require("../../../core"));
32
- const cmdOpts = __importStar(require("../../../cmd-opts"));
33
- const platforma = __importStar(require("../../../platforma"));
34
- const util = __importStar(require("../../../util"));
35
- class FS extends core_1.Command {
31
+ const core_2 = __importDefault(require("../../core"));
32
+ const cmdOpts = __importStar(require("../../cmd-opts"));
33
+ const platforma = __importStar(require("../../platforma"));
34
+ const util = __importStar(require("../../util"));
35
+ const state_1 = __importDefault(require("../../state"));
36
+ class Local extends core_1.Command {
36
37
  static description = 'Run Platforma Backend service as local process on current host (no docker container)';
37
38
  static examples = ['<%= config.bin %> <%= command.id %>'];
38
39
  static flags = {
@@ -44,21 +45,21 @@ class FS extends core_1.Command {
44
45
  ...cmdOpts.ConfigFlag,
45
46
  ...cmdOpts.LicenseFlags,
46
47
  ...cmdOpts.StorageFlag,
47
- ...cmdOpts.StoragePrimaryPathFlag,
48
+ ...cmdOpts.StoragePrimaryURLFlag,
48
49
  ...cmdOpts.StorageWorkPathFlag,
49
- ...cmdOpts.StorageLibraryPathFlag,
50
+ ...cmdOpts.StorageLibraryURLFlag,
50
51
  ...cmdOpts.PlLogFileFlag,
51
52
  ...cmdOpts.PlWorkdirFlag,
52
53
  ...cmdOpts.AuthFlags
53
54
  };
54
55
  async run() {
55
- const { flags } = await this.parse(FS);
56
+ const { flags } = await this.parse(Local);
56
57
  const logger = util.createLogger(flags['log-level']);
57
58
  const core = new core_2.default(logger);
58
59
  core.mergeLicenseEnvs(flags);
59
60
  const workdir = flags['pl-workdir'] ?? '.';
60
- const storage = flags.storage ? path_1.default.resolve(workdir, flags.storage) : undefined;
61
- const logFile = flags['pl-log-file'] ? path_1.default.resolve(workdir, flags['pl-log-file']) : 'stdout';
61
+ const storage = flags.storage ? path_1.default.join(workdir, flags.storage) : state_1.default.path('data', 'local');
62
+ const logFile = flags['pl-log-file'] ? path_1.default.join(workdir, flags['pl-log-file']) : undefined;
62
63
  const authDrivers = core.initAuthDriversList(flags, workdir);
63
64
  const authEnabled = flags['auth-enabled'] ?? authDrivers !== undefined;
64
65
  var binaryPath = flags['pl-binary'];
@@ -70,6 +71,8 @@ class FS extends core_1.Command {
70
71
  version: flags.version,
71
72
  configPath: flags.config,
72
73
  workdir: flags['pl-workdir'],
74
+ primaryURL: flags['storage-primary'],
75
+ libraryURL: flags['storage-library'],
73
76
  configOptions: {
74
77
  grpc: { listen: flags['grpc-listen'] },
75
78
  monitoring: { listen: flags['monitoring-listen'] },
@@ -79,24 +82,22 @@ class FS extends core_1.Command {
79
82
  localRoot: storage,
80
83
  core: { auth: { enabled: authEnabled, drivers: authDrivers } },
81
84
  storages: {
82
- primary: { type: 'FS', rootPath: flags['storage-primary'] },
83
- work: { type: 'FS', rootPath: flags['storage-work'] },
84
- library: { type: 'FS', rootPath: flags['storage-library'] }
85
+ work: { type: 'FS', rootPath: flags['storage-work'] }
85
86
  }
86
87
  }
87
88
  };
88
89
  if (startOptions.binaryPath) {
89
- core.startLocalFS(startOptions);
90
+ core.startLocal(startOptions);
90
91
  }
91
92
  else {
92
93
  platforma
93
94
  .getBinary(logger, { version: flags.version })
94
- .then(() => core.startLocalFS(startOptions))
95
+ .then(() => core.startLocal(startOptions))
95
96
  .catch(function (err) {
96
97
  logger.error(err.message);
97
98
  });
98
99
  }
99
100
  }
100
101
  }
101
- exports.default = FS;
102
- //# sourceMappingURL=fs.js.map
102
+ exports.default = Local;
103
+ //# sourceMappingURL=local.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"local.js","sourceRoot":"","sources":["../../../src/commands/start/local.ts"],"names":[],"mappings":"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"}
package/dist/core.d.ts CHANGED
@@ -7,24 +7,21 @@ export default class Core {
7
7
  constructor(logger: winston.Logger);
8
8
  startLast(): void;
9
9
  startLocal(options?: startLocalOptions): ChildProcess;
10
- startLocalFS(options?: startLocalFSOptions): ChildProcess;
11
- startLocalS3(options?: startLocalOptions): ChildProcess;
10
+ startLocalS3(options?: startLocalS3Options): ChildProcess;
12
11
  startMinio(options?: {
12
+ image?: string;
13
+ version?: string;
13
14
  minioPort?: number;
14
15
  minioConsolePort?: number;
15
16
  storage?: string;
16
- image?: string;
17
- version?: string;
18
17
  }): void;
19
18
  buildPlatforma(options: {
20
19
  repoRoot: string;
21
20
  binPath?: string;
22
21
  }): string;
23
- startDockerS3(options?: {
22
+ startDockerS3(localRoot: string, options?: {
24
23
  image?: string;
25
24
  version?: string;
26
- primaryURL?: string;
27
- libraryURL?: string;
28
25
  auth?: types.authOptions;
29
26
  license?: string;
30
27
  licenseFile?: string;
@@ -32,10 +29,10 @@ export default class Core {
32
29
  'monitoring-port'?: number;
33
30
  'debug-port'?: number;
34
31
  }): void;
35
- startDockerFS(options?: {
36
- primaryStorage?: string;
37
- workStorage?: string;
38
- libraryStorage?: string;
32
+ startDocker(localRoot: string, options?: {
33
+ primaryStorageURL?: string;
34
+ workStoragePath?: string;
35
+ libraryStorageURL?: string;
39
36
  image?: string;
40
37
  version?: string;
41
38
  auth?: types.authOptions;
@@ -60,21 +57,22 @@ export default class Core {
60
57
  getLastJwt(): string;
61
58
  private destroyDocker;
62
59
  private checkLicense;
63
- private checkVolumeConfig;
60
+ private configureDockerStorage;
64
61
  private readComposeFile;
65
62
  private writeComposeFile;
66
63
  }
67
64
  export declare function checkRunError(result: SpawnSyncReturns<Buffer>, message?: string): void;
68
- export type startLocalFSOptions = {
65
+ export type startLocalOptions = {
69
66
  version?: string;
70
67
  binaryPath?: string;
71
68
  configPath?: string;
72
69
  configOptions?: plCfg.plOptions;
73
70
  workdir?: string;
74
- };
75
- export type startLocalOptions = startLocalFSOptions & {
76
71
  primaryURL?: string;
77
72
  libraryURL?: string;
73
+ };
74
+ export type startLocalFSOptions = startLocalOptions;
75
+ export type startLocalS3Options = Omit<startLocalOptions, 'primaryURL' | 'libraryURL'> & {
78
76
  minioPort?: number;
79
77
  minioConsolePort?: number;
80
78
  };