Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
.env
.env.example
.env.dev
.env.dev.example
.idea/
.idea/
.git/
.github/
.env*
Dockerfile*
info.php
compose*
README.md
.dockerignore
.gitattributes
.gitignore
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ discordguild.php
f.php
test.php
phptags
docker-compose.debug.yaml
compose.debug.yaml
assets/css/style_new.css
.idea/
assets/css/style_bonk.css
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
- copy .env.dev.example to .env.dev
- enter all properties
- add the bot to your server
- run `docker-compose -f docker-compose.debug.yaml up`
- run `docker compose -f compose.debug.yaml up`
25 changes: 25 additions & 0 deletions compose.debug.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
services:
mysql:
container_name: mysql_dev
image: mysql
command: --default-authentication-plugin=mysql_native_password
environment:
MYSQL_ROOT_PASSWORD: test
MYSQL_DATABASE: test
devmarkt3:
container_name: bivieh_devmarkt_dev
build:
context: .
dockerfile: Dockerfile.debug
ports:
- "8080:80"
volumes:
- ./:/var/www/
environment:
MYSQL_HOST: mysql_dev
MYSQL_DATABASE: test
MYSQL_USER: root
MYSQL_PASSWORD: test
BOT_REDIRECT_URI: http://localhost:8080/login.php?
BOT_BASE_URI: http://localhost:8080
env_file: .env.dev
11 changes: 11 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
services:
devmarkt:
container_name: bivieh_devmarkt
build:
context: .
dockerfile: Dockerfile
volumes:
- ./:/var/www/
ports:
- "8080:80"
env_file: .env
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"php": "*",
"guzzlehttp/guzzle": "*",
"wohali/oauth2-discord-new": "*",
"ext-pdo": "*",
"ext-pdo": "*",
"monolog/monolog": "*",
"ext-gd": "*"
},
Expand Down
Loading
Loading