@contember/cli-common 1.0.0-rc.0 → 1.0.0-rc.1
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/package.json +2 -2
- package/resources/templates/template-project/admin/.env +3 -0
- package/resources/templates/template-project/contember.template.yaml +1 -0
- package/resources/templates/template-workspace/contember.template.yaml +0 -1
- package/resources/templates/template-workspace/docker-compose.yaml +4 -39
- package/resources/templates/template-workspace/package.json +3 -1
- package/resources/templates/template-workspace/contember.yaml +0 -5
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@contember/cli-common",
|
|
3
|
-
"version": "1.0.0-rc.
|
|
3
|
+
"version": "1.0.0-rc.1",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "dist/src/index.js",
|
|
6
6
|
"typings": "dist/src/index.d.ts",
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"@types/npm-package-arg": "^6.1.0"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@contember/config-loader": "^1.0.0-rc.
|
|
16
|
+
"@contember/config-loader": "^1.0.0-rc.1",
|
|
17
17
|
"chalk": "^4.1.0",
|
|
18
18
|
"download-tarball": "^2.0.0",
|
|
19
19
|
"fs-extra": "^10.0.0",
|
|
@@ -1,25 +1,7 @@
|
|
|
1
1
|
version: '2.4'
|
|
2
2
|
|
|
3
3
|
services:
|
|
4
|
-
|
|
5
|
-
image: node:16-alpine
|
|
6
|
-
command: 'npm run start-admin'
|
|
7
|
-
user: '1000:1000'
|
|
8
|
-
|
|
9
|
-
environment:
|
|
10
|
-
VITE_PORT: '1480'
|
|
11
|
-
VITE_CONTEMBER_ADMIN_API_BASE_URL: 'http://localhost:1481'
|
|
12
|
-
VITE_CONTEMBER_ADMIN_SESSION_TOKEN: '0000000000000000000000000000000000000000'
|
|
13
|
-
VITE_CONTEMBER_ADMIN_PROJECT_NAME: '{projectName}'
|
|
14
|
-
|
|
15
|
-
ports:
|
|
16
|
-
- '1480:1480' # ports must match
|
|
17
|
-
|
|
18
|
-
working_dir: /src
|
|
19
|
-
volumes:
|
|
20
|
-
- ./:/src:cached
|
|
21
|
-
|
|
22
|
-
engine:
|
|
4
|
+
contember-engine:
|
|
23
5
|
image: contember/engine:{version}
|
|
24
6
|
|
|
25
7
|
environment:
|
|
@@ -69,27 +51,10 @@ services:
|
|
|
69
51
|
contember-cli:
|
|
70
52
|
image: contember/cli:{version}
|
|
71
53
|
user: '1000:1000'
|
|
54
|
+
scale: 0
|
|
72
55
|
|
|
73
56
|
environment:
|
|
74
|
-
CONTEMBER_API_URL: 'http://engine:4000/'
|
|
75
|
-
CONTEMBER_API_TOKEN: '0000000000000000000000000000000000000000'
|
|
76
|
-
CONTEMBER_PROJECT_NAME: '{projectName}'
|
|
77
|
-
|
|
78
|
-
working_dir: /src
|
|
79
|
-
volumes:
|
|
80
|
-
- ./:/src:cached
|
|
81
|
-
|
|
82
|
-
depends_on:
|
|
83
|
-
engine:
|
|
84
|
-
condition: service_healthy
|
|
85
|
-
|
|
86
|
-
contember-migrations:
|
|
87
|
-
image: contember/cli:{version}
|
|
88
|
-
command: 'migrations:execute . --yes'
|
|
89
|
-
user: '1000:1000'
|
|
90
|
-
|
|
91
|
-
environment:
|
|
92
|
-
CONTEMBER_API_URL: 'http://engine:4000/'
|
|
57
|
+
CONTEMBER_API_URL: 'http://contember-engine:4000/'
|
|
93
58
|
CONTEMBER_API_TOKEN: '0000000000000000000000000000000000000000'
|
|
94
59
|
CONTEMBER_PROJECT_NAME: '{projectName}'
|
|
95
60
|
|
|
@@ -98,7 +63,7 @@ services:
|
|
|
98
63
|
- ./:/src:cached
|
|
99
64
|
|
|
100
65
|
depends_on:
|
|
101
|
-
engine:
|
|
66
|
+
contember-engine:
|
|
102
67
|
condition: service_healthy
|
|
103
68
|
|
|
104
69
|
postgres:
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"scripts-template": {
|
|
3
3
|
"contember": "docker-compose run contember-cli",
|
|
4
|
-
"start
|
|
4
|
+
"start": "npm run start-engine && npm run start-admin",
|
|
5
|
+
"start-engine": "npm run contember migrations:execute . --yes && docker-compose up --detach",
|
|
6
|
+
"start-admin": "vite admin --port 1480 --host 0.0.0.0",
|
|
5
7
|
"build-admin": "tsc && vite build admin"
|
|
6
8
|
},
|
|
7
9
|
"devDependencies": {
|