Lou 3 years ago
parent
commit
b1b171160a
2 changed files with 15 additions and 9 deletions
  1. 6
    3
      docker-compose.yml
  2. 9
    6
      init.sh

+ 6
- 3
docker-compose.yml View File

@@ -8,9 +8,9 @@ services:
8 8
         environment:
9 9
             - GITEA__database__DB_TYPE=mysql
10 10
             - GITEA__database__HOST=db:3306
11
-            - GITEA__database__NAME=gitea
11
+            - GITEA__database__NAME=gitea-db
12 12
             - GITEA__database__USER=gitea
13
-            - GITEA__database__PASSWD=DB-PWD
13
+            - GITEA__database__PASSWD=
14 14
         networks:
15 15
             - gitea
16 16
         ports:
@@ -27,7 +27,10 @@ services:
27 27
         volumes:
28 28
             - gitea-db:/var/lib/mysql
29 29
         environment:
30
-            MYSQL_ROOT_PASSWORD: 
30
+            MYSQL_ROOT_PASSWORD=
31
+            MYSQL_USER=gitea
32
+            MYSQL_PASSWORD=
33
+            MYSQL_DATABASE=gitea
31 34
         restart: unless-stopped
32 35
 
33 36
 networks:

+ 9
- 6
init.sh View File

@@ -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

Loading…
Cancel
Save