Skip to content

Commit 14d825e

Browse files
Merge #93
93: docker-compose.yaml: init r=bobby285271 a=bobby285271 cc `@lr580` Co-authored-by: Bobby Rong <rjl931189261@126.com>
2 parents c599337 + 1d27c46 commit 14d825e

File tree

4 files changed

+48
-8
lines changed

4 files changed

+48
-8
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@ tests/_support/_generated
6060

6161
#used by socoding internally
6262
/chore.sh
63+
64+
# generated by docker-compose
65+
data

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@
3434
"process-timeout": 1800,
3535
"fxp-asset": {
3636
"enabled": false
37+
},
38+
"allow-plugins": {
39+
"cweagans/composer-patches": true,
40+
"yiisoft/yii2-composer": true
3741
}
3842
},
3943
"scripts": {

composer.lock

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docker-compose.yaml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Taken from https://github.com/shi-yang/jnoj/commit/1377a504e4542ddccaa85301c1eece13e2e4fab8
2+
# Thanks @shi-yang
3+
4+
# This file is for development propose only.
5+
# You will have to adjust config/db.php to use the correct host (mysql) and user (root).
6+
7+
version: '3'
8+
9+
services:
10+
myadminfortest:
11+
image: phpmyadmin/phpmyadmin
12+
container_name: myadminfortest
13+
ports:
14+
- 8888:80
15+
depends_on:
16+
- mysql
17+
environment:
18+
PMA_USER: root
19+
PMA_PASSWORD: 123456
20+
links:
21+
- mysql:db
22+
23+
mysql:
24+
image: mysql:8.0
25+
container_name: mysql
26+
restart: always
27+
volumes:
28+
- ./data/mysql/data:/var/lib/mysql
29+
environment:
30+
MYSQL_DATABASE: scnuoj
31+
MYSQL_ROOT_PASSWORD: 123456
32+
TZ: Asia/Shanghai
33+
34+
php:
35+
image: yiisoftware/yii2-php:7.4-apache
36+
volumes:
37+
- ./:/app:delegated
38+
ports:
39+
- '8000:80'

0 commit comments

Comments
 (0)