Skip to content

Commit a11c5b0

Browse files
authored
Merge pull request #123 from fishTsai20/fish/webhdfs
✨ feat: Integrate Chainbase Platform as Primary Data Source to Enhance Manuscript's Data Capabilities
2 parents 2049804 + 2f1ce09 commit a11c5b0

File tree

7 files changed

+658
-625
lines changed

7 files changed

+658
-625
lines changed

cli/client/network_chains.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func NewChainBaseClient(baseURL string, chainEndpoint string) *ChainBaseClient {
5151
baseURL: baseURL,
5252
chainEndpoint: chainEndpoint,
5353
httpClient: &http.Client{
54-
Timeout: 10 * time.Second,
54+
Timeout: 30 * time.Second,
5555
},
5656
}
5757
}

cli/commands/init_manuscript.go

-1
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,6 @@ func startDockerContainers(dir string) error {
311311

312312
// Check if 'docker' exists first and prefer 'docker compose' if available
313313
if _, err := exec.LookPath("docker"); err == nil {
314-
cmd = exec.Command("docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml"), "up", "-d")
315314
cmd = exec.Command("docker", "compose", "-f", filepath.Join(dir, "docker-compose.yml"), "up", "-d")
316315
err = runCommand(cmd)
317316
if err == nil {

cli/static/docker_compose_template.go

+27-8
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,13 @@ var DockerComposeTemplate = `
44
name: {{.Name}}
55
services:
66
jobmanager:
7-
image: repository.chainbase.com/manuscript-node/manuscript-node:latest
8-
user: "flink"
7+
image: repository.chainbase.com/manuscript-node/manuscript-node:v1.1.4
8+
pull_policy: always
9+
user: "manuscript"
10+
environment:
11+
- |
12+
FLINK_PROPERTIES=
13+
jobmanager.rpc.address: {{.Name}}-jobmanager-1
914
command: "standalone-job --job-classname com.chainbase.manuscript.ETLProcessor /opt/flink/manuscript.yaml --fromSavepoint /opt/flink/savepoint"
1015
ports:
1116
- "{{.Port}}:8081"
@@ -18,8 +23,13 @@ services:
1823
- ms_network_{{ .Name }}
1924
2025
taskmanager:
21-
image: repository.chainbase.com/manuscript-node/manuscript-node:latest
22-
user: "flink"
26+
image: repository.chainbase.com/manuscript-node/manuscript-node:v1.1.4
27+
pull_policy: always
28+
user: "manuscript"
29+
environment:
30+
- |
31+
FLINK_PROPERTIES=
32+
jobmanager.rpc.address: {{.Name}}-jobmanager-1
2333
depends_on:
2434
- jobmanager
2535
command: "taskmanager"
@@ -39,9 +49,13 @@ var DockerComposeWithPostgresqlContent = `
3949
name: {{.Name}}
4050
services:
4151
jobmanager:
42-
image: repository.chainbase.com/manuscript-node/manuscript-node:latest
52+
image: repository.chainbase.com/manuscript-node/manuscript-node:v1.1.4
4353
pull_policy: always
44-
user: "flink"
54+
user: "manuscript"
55+
environment:
56+
- |
57+
FLINK_PROPERTIES=
58+
jobmanager.rpc.address: {{.Name}}-jobmanager-1
4559
command: "standalone-job --job-classname com.chainbase.manuscript.ETLProcessor /opt/flink/manuscript.yaml --fromSavepoint /opt/flink/savepoint"
4660
ports:
4761
- "{{.Port}}:8081"
@@ -57,8 +71,12 @@ services:
5771
- ms_network_{{ .Name }}
5872
5973
taskmanager:
60-
image: repository.chainbase.com/manuscript-node/manuscript-node:latest
61-
user: "flink"
74+
image: repository.chainbase.com/manuscript-node/manuscript-node:v1.1.4
75+
user: "manuscript"
76+
environment:
77+
- |
78+
FLINK_PROPERTIES=
79+
jobmanager.rpc.address: {{.Name}}-jobmanager-1
6280
depends_on:
6381
- jobmanager
6482
command: "taskmanager"
@@ -98,6 +116,7 @@ services:
98116
- taskmanager
99117
environment:
100118
HASURA_GRAPHQL_DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/{{.Database}}
119+
HASURA_GRAPHQL_METADATA_DATABASE_URL: postgres://postgres:${POSTGRES_PASSWORD:-postgres}@postgres:5432/{{.Database}}
101120
HASURA_GRAPHQL_ENABLE_CONSOLE: "true"
102121
networks:
103122
- ms_network_{{ .Name }}

0 commit comments

Comments
 (0)