Skip to content

Commit 1ed227c

Browse files
Fix Docker build setup (#10)
1 parent c027f2d commit 1ed227c

10 files changed

Lines changed: 140 additions & 190 deletions

.dockerignore

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
.env
2-
.env.example
3-
.env.dev
4-
.env.dev.example
5-
.idea/
1+
.idea/
2+
.git/
3+
.github/
4+
.env*
5+
Dockerfile*
6+
info.php
7+
compose*
8+
README.md
9+
.dockerignore
10+
.gitattributes
11+
.gitignore

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ discordguild.php
44
f.php
55
test.php
66
phptags
7-
docker-compose.debug.yaml
7+
compose.debug.yaml
88
assets/css/style_new.css
99
.idea/
1010
assets/css/style_bonk.css

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
- copy .env.dev.example to .env.dev
55
- enter all properties
66
- add the bot to your server
7-
- run `docker-compose -f docker-compose.debug.yaml up`
7+
- run `docker compose -f compose.debug.yaml up`

compose.debug.yaml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
services:
2+
mysql:
3+
container_name: mysql_dev
4+
image: mysql
5+
command: --default-authentication-plugin=mysql_native_password
6+
environment:
7+
MYSQL_ROOT_PASSWORD: test
8+
MYSQL_DATABASE: test
9+
devmarkt3:
10+
container_name: bivieh_devmarkt_dev
11+
build:
12+
context: .
13+
dockerfile: Dockerfile.debug
14+
ports:
15+
- "8080:80"
16+
volumes:
17+
- ./:/var/www/
18+
environment:
19+
MYSQL_HOST: mysql_dev
20+
MYSQL_DATABASE: test
21+
MYSQL_USER: root
22+
MYSQL_PASSWORD: test
23+
BOT_REDIRECT_URI: http://localhost:8080/login.php?
24+
BOT_BASE_URI: http://localhost:8080
25+
env_file: .env.dev

compose.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
services:
2+
devmarkt:
3+
container_name: bivieh_devmarkt
4+
build:
5+
context: .
6+
dockerfile: Dockerfile
7+
volumes:
8+
- ./:/var/www/
9+
ports:
10+
- "8080:80"
11+
env_file: .env

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"php": "*",
66
"guzzlehttp/guzzle": "*",
77
"wohali/oauth2-discord-new": "*",
8-
"ext-pdo": "*",
8+
"ext-pdo": "*",
99
"monolog/monolog": "*",
1010
"ext-gd": "*"
1111
},

0 commit comments

Comments
 (0)