@contember/cli-common 1.0.0-rc.1 → 1.0.0-rc.5

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.
Files changed (8) hide show
  1. package/package.json +2 -2
  2. package/resources/templates/template-project/admin/index.html +1 -1
  3. package/resources/templates/template-project/admin/pages/index.tsx +1 -1
  4. package/resources/templates/template-project/contember.template.yaml +1 -1
  5. package/resources/templates/template-workspace/docker-compose.yaml +4 -10
  6. package/resources/templates/template-workspace/package.json +1 -1
  7. package/resources/templates/template-workspace/docker/minio/s3-entrypoint.sh +0 -8
  8. package/resources/templates/template-workspace/docker/minio/s3-policy.json +0 -34
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contember/cli-common",
3
- "version": "1.0.0-rc.1",
3
+ "version": "1.0.0-rc.5",
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.1",
16
+ "@contember/config-loader": "^1.0.0-rc.5",
17
17
  "chalk": "^4.1.0",
18
18
  "download-tarball": "^2.0.0",
19
19
  "fs-extra": "^10.0.0",
package/resources/templates/template-project/admin/index.html CHANGED
@@ -2,7 +2,7 @@
2
2
  <html>
3
3
  <head>
4
4
  <meta charset="utf-8">
5
- <meta name="viewport" content="width=device-width">
5
+ <meta name="viewport" content="width=device-width, viewport-fit=cover">
6
6
  <title>Admin {projectName}</title>
7
7
  <script type="module" src="./index.tsx"></script>
8
8
  </head>
package/resources/templates/template-project/admin/pages/index.tsx CHANGED
@@ -2,7 +2,7 @@ import * as React from 'react'
2
2
  import { GenericPage } from '@contember/admin'
3
3
 
4
4
  export const index = (
5
- <GenericPage pageName="index">
5
+ <GenericPage>
6
6
  Welcome to Contember Admin!
7
7
  </GenericPage>
8
8
  )
package/resources/templates/template-project/contember.template.yaml CHANGED
@@ -1,5 +1,5 @@
1
1
  type: project
2
2
  replaceVariables:
3
3
  - admin/.env
4
- - admin/index.tsx
4
+ - admin/index.html
5
5
  - admin/components/Layout.tsx
package/resources/templates/template-workspace/docker-compose.yaml CHANGED
@@ -12,11 +12,7 @@ services:
12
12
  CONTEMBER_ROOT_PASSWORD: 'contember'
13
13
  CONTEMBER_ROOT_TOKEN: '0000000000000000000000000000000000000000' # openssl rand -hex 20
14
14
  CONTEMBER_LOGIN_TOKEN: '1111111111111111111111111111111111111111' # openssl rand -hex 20
15
-
16
- CONTEMBER_CONFIG_YAML: |
17
- projectDefaults:
18
- s3:
19
- prefix: '%project.slug%'
15
+ CONTEMBER_ENCRYPTION_KEY: "0000000000000000000000000000000000000000000000000000000000000000" #openssl rand -hex 32
20
16
 
21
17
  DEFAULT_DB_HOST: 'postgres'
22
18
  DEFAULT_DB_PORT: '5432'
@@ -87,20 +83,18 @@ services:
87
83
  retries: 10
88
84
 
89
85
  s3:
90
- image: minio/minio
91
- entrypoint: /minio/s3-entrypoint.sh
92
- command: 'server --address :1483 /data'
86
+ image: bitnami/minio
93
87
 
94
88
  environment:
95
89
  MINIO_ROOT_USER: 'contember'
96
90
  MINIO_ROOT_PASSWORD: 'contember'
91
+ MINIO_DEFAULT_BUCKETS: 'contember:download'
97
92
 
98
93
  ports:
99
- - '1483:1483' # ports must match
94
+ - '1483:9000'
100
95
 
101
96
  volumes:
102
97
  - s3-data:/data
103
- - ./docker/minio/:/minio
104
98
 
105
99
  mailhog:
106
100
  image: mailhog/mailhog
package/resources/templates/template-workspace/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "scripts-template": {
3
3
  "contember": "docker-compose run contember-cli",
4
4
  "start": "npm run start-engine && npm run start-admin",
5
- "start-engine": "npm run contember migrations:execute . --yes && docker-compose up --detach",
5
+ "start-engine": "docker-compose up --detach && npm run contember migrations:execute . --yes",
6
6
  "start-admin": "vite admin --port 1480 --host 0.0.0.0",
7
7
  "build-admin": "tsc && vite build admin"
8
8
  },
package/resources/templates/template-workspace/docker/minio/s3-entrypoint.sh DELETED
@@ -1,8 +0,0 @@
1
- #!/bin/sh
2
- set -ex
3
-
4
- mkdir -p /data/contember
5
- mkdir -p /data/.minio.sys/buckets/contember/
6
- cp /minio/s3-policy.json /data/.minio.sys/buckets/contember/policy.json
7
-
8
- minio "$@"
package/resources/templates/template-workspace/docker/minio/s3-policy.json DELETED
@@ -1,34 +0,0 @@
1
- {
2
- "Version": "2012-10-17",
3
- "Statement": [
4
- {
5
- "Effect": "Allow",
6
- "Principal": {
7
- "AWS": [
8
- "*"
9
- ]
10
- },
11
- "Action": [
12
- "s3:GetBucketLocation",
13
- "s3:ListBucket"
14
- ],
15
- "Resource": [
16
- "arn:aws:s3:::contember"
17
- ]
18
- },
19
- {
20
- "Effect": "Allow",
21
- "Principal": {
22
- "AWS": [
23
- "*"
24
- ]
25
- },
26
- "Action": [
27
- "s3:GetObject"
28
- ],
29
- "Resource": [
30
- "arn:aws:s3:::contember/*"
31
- ]
32
- }
33
- ]
34
- }