Skip to content

Commit 4d13fb1

Browse files
authored
Merge pull request #1171 from merico-dev/release-v0.7.0
Release v0.7.0
2 parents 164f05d + 0462320 commit 4d13fb1

File tree

3 files changed

+78
-6
lines changed

3 files changed

+78
-6
lines changed

docker-compose.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,15 @@ services:
2222
- 3002:3000
2323
volumes:
2424
- grafana-storage:/var/lib/grafana
25-
- ./grafana/provisioning/datasources:/etc/grafana/provisioning/datasources
2625
environment:
2726
GF_USERS_ALLOW_SIGN_UP: 'false'
2827
GF_DASHBOARDS_JSON_ENABLED: 'true'
2928
GF_INSTALL_PLUGINS: grafana-piechart-panel
3029
GF_LIVE_ALLOWED_ORIGINS: '*'
30+
MYSQL_URL: mysql:3306
31+
MYSQL_DATABASE: lake
32+
MYSQL_USER: merico
33+
MYSQL_PASSWORD: merico
3134
restart: always
3235
depends_on:
3336
- mysql

grafana/provisioning/datasources/datasource.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ apiVersion: 1
44
datasources:
55
- name: mysql
66
type: mysql
7-
url: mysql:3306
8-
database: lake
9-
user: merico
7+
url: $MYSQL_URL
8+
database: $MYSQL_DATABASE
9+
user: $MYSQL_USER
1010
secureJsonData:
11-
password: "merico"
12-
editable: true
11+
password: $MYSQL_PASSWORD
12+
editable: false
Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
version: "3"
2+
services:
3+
mysql:
4+
image: mysql:8.0.26
5+
platform: linux/x86_64
6+
volumes:
7+
- mysql-storage:/var/lib/mysql
8+
restart: always
9+
ports:
10+
- 127.0.0.1:3306:3306
11+
environment:
12+
MYSQL_ROOT_PASSWORD: admin
13+
MYSQL_DATABASE: lake
14+
MYSQL_USER: merico
15+
MYSQL_PASSWORD: merico
16+
17+
grafana:
18+
image: mericodev/grafana:v0.7.0
19+
build:
20+
context: grafana/
21+
ports:
22+
- 3002:3000
23+
volumes:
24+
- grafana-storage:/var/lib/grafana
25+
environment:
26+
GF_USERS_ALLOW_SIGN_UP: 'false'
27+
GF_DASHBOARDS_JSON_ENABLED: 'true'
28+
GF_INSTALL_PLUGINS: grafana-piechart-panel
29+
GF_LIVE_ALLOWED_ORIGINS: '*'
30+
MYSQL_URL: mysql:3306
31+
MYSQL_DATABASE: lake
32+
MYSQL_USER: merico
33+
MYSQL_PASSWORD: merico
34+
restart: always
35+
depends_on:
36+
- mysql
37+
38+
devlake:
39+
image: mericodev/lake:v0.7.0
40+
build:
41+
context: "."
42+
args:
43+
HTTPS_PROXY: "${HTTPS_PROXY}"
44+
GOPROXY: "${GOPROXY}"
45+
ports:
46+
- 127.0.0.1:8080:8080
47+
restart: always
48+
volumes:
49+
- ./.env:/app/.env
50+
depends_on:
51+
- mysql
52+
53+
config-ui:
54+
image: mericodev/config-ui:v0.7.0
55+
build:
56+
context: "config-ui"
57+
ports:
58+
- 127.0.0.1:4000:80
59+
env_file:
60+
- ./.env
61+
#environment:
62+
#ADMIN_USER: devlake
63+
#ADMIN_PASS: merico
64+
depends_on:
65+
- devlake
66+
67+
volumes:
68+
mysql-storage:
69+
grafana-storage:

0 commit comments

Comments
 (0)