|
@@ -12,9 +12,9 @@ services:
|
12
|
12
|
environment:
|
13
|
13
|
- GITEA__database__DB_TYPE=mysql
|
14
|
14
|
- GITEA__database__HOST=db:3306
|
15
|
|
- - GITEA__database__NAME=gitea
|
|
15
|
+ - GITEA__database__NAME=gitea-db
|
16
|
16
|
- GITEA__database__USER=gitea
|
17
|
|
- - GITEA__database__PASSWD=${GITEA-DB-PWD}
|
|
17
|
+ - GITEA__database__PASSWD=${GITEA_DB_PWD}
|
18
|
18
|
networks:
|
19
|
19
|
- gitea
|
20
|
20
|
ports:
|
|
@@ -27,11 +27,14 @@ services:
|
27
|
27
|
db:
|
28
|
28
|
image: mariadb
|
29
|
29
|
ports:
|
30
|
|
- - "3306:3306"
|
|
30
|
+ - 3306:3306
|
31
|
31
|
volumes:
|
32
|
32
|
- gitea-db:/var/lib/mysql
|
33
|
33
|
environment:
|
34
|
|
- MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
|
|
34
|
+ MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
|
35
|
+ MYSQL_USER=gitea
|
|
36
|
+ MYSQL_PASSWORD=${MYSQL_PASSWORD}
|
|
37
|
+ MYSQL_DATABASE=gitea
|
35
|
38
|
restart: unless-stopped
|
36
|
39
|
|
37
|
40
|
networks:
|
|
@@ -41,6 +44,6 @@ networks:
|
41
|
44
|
volumes:
|
42
|
45
|
gitea-filestore:
|
43
|
46
|
gitea-db:
|
44
|
|
-"> ./docker-compose-2.yml
|
|
47
|
+"> ./docker-compose.yml
|
45
|
48
|
|
46
|
|
-docker-compose up -d
|
|
49
|
+docker-compose up --build -d
|