Skip to content

Commit

Permalink
Summary lib
Browse files Browse the repository at this point in the history
  • Loading branch information
byt3n33dl3 committed Jul 8, 2024
1 parent 42f28e7 commit c650913
Show file tree
Hide file tree
Showing 12 changed files with 16,806 additions and 39 deletions.
6 changes: 3 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
APP_NAME=Trojan-Panel
APP_NAME=grizzly
APP_ENV=production
APP_KEY=
APP_DEBUG=false
Expand All @@ -9,8 +9,8 @@ LOG_CHANNEL=stack
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=trojan
DB_USERNAME=trojan
DB_DATABASE=grizzly
DB_USERNAME=grizzly
DB_PASSWORD=

BROADCAST_DRIVER=log
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "laravel/laravel",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"license": "MIT",
"name": "lib/lib",
"description": "The lib Framework.",
"keywords": ["framework", "lib"],
"license": "other",
"type": "project",
"require": {
"php": "^7.1.3",
"fideloper/proxy": "^4.0",
"laravel/framework": "5.7.*",
"laravel/tinker": "^1.0"
"lib/framework": "5.7.*",
"lib/tinker": "^1.0"
},
"require-dev": {
"beyondcode/laravel-dump-server": "^1.0",
"beyondcode/lib-dump-server": "^1.0",
"filp/whoops": "^2.0",
"fzaninotto/faker": "^1.4",
"mockery/mockery": "^1.0",
Expand All @@ -33,7 +33,7 @@
}
},
"extra": {
"laravel": {
"lib": {
"dont-discover": [
]
}
Expand Down
56 changes: 28 additions & 28 deletions dockerComposer.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
version: '3'

services:
trojan-panel-caddy:
grizzly:
image: caddy:2.6.2
container_name: trojan-panel-caddy
container_name: grizzly
restart: always
network_mode: host
volumes:
Expand All @@ -13,33 +13,33 @@ services:
- "/tpdata/caddy/logs/:/tpdata/caddy/logs/"
command: caddy run --config /tpdata/caddy/config.json

trojan-panel-mariadb:
grizzly-mariadb:
image: mariadb:10.7.3
container_name: trojan-panel-mariadb
container_name: grizzly-mariadb
restart: always
network_mode: host
environment:
MYSQL_DATABASE: trojan_panel_db
MYSQL_DATABASE: grizzly_db
MYSQL_ROOT_PASSWORD: "${mariadb_pas}"
TZ: Asia/Shanghai
command: --port=9507

trojan-panel-redis:
grizzly-redis:
image: redis:6.2.7
container_name: trojan-panel-redis
container_name: grizzly-redis
restart: always
network_mode: host
command: redis-server --requirepass ${redis_pass} --port 6378

trojan-panel:
image: jonssonyan/trojan-panel
container_name: trojan-panel
grizzly:
image: jonssonyan/grizzly
container_name: grizzly
restart: always
network_mode: host
volumes:
- "/tpdata/web/:/tpdata/trojan-panel/webfile/"
- "/tpdata/trojan-panel/logs/:/tpdata/trojan-panel/logs/"
- "/tpdata/trojan-panel/config/:/tpdata/trojan-panel/config/"
- "/tpdata/web/:/tpdata/grizzly/webfile/"
- "/tpdata/grizzly/logs/:/tpdata/grizzly/logs/"
- "/tpdata/grizzly/config/:/tpdata/grizzly/config/"
- "/etc/localtime:/etc/localtime"
environment:
- "GIN_MODE=release"
Expand All @@ -52,28 +52,28 @@ services:
- "redis_pass=${redis_pass}"
- "server_port=8081"

trojan-panel-ui:
image: jonssonyan/trojan-panel-ui
container_name: trojan-panel-ui
grizzly-ui:
image: jonssonyan/grizzly-ui
container_name: grizzly-ui
restart: always
network_mode: host
volumes:
- "/tpdata/trojan-panel-ui/nginx/default.conf:/etc/nginx/conf.d/default.conf"
- "/tpdata/grizzly-ui/nginx/default.conf:/etc/nginx/conf.d/default.conf"
- "/tpdata/cert/:/tpdata/cert/"

trojan-panel-core:
image: jonssonyan/trojan-panel-core
container_name: trojan-panel-core
grizzly-core:
image: jonssonyan/grizzly-core
container_name: grizzly-core
restart: always
network_mode: host
volumes:
- "/tpdata/trojan-panel-core/bin/xray/config/:/tpdata/trojan-panel-core/bin/xray/config/"
- "/tpdata/trojan-panel-core/bin/trojango/config/:/tpdata/trojan-panel-core/bin/trojango/config/"
- "/tpdata/trojan-panel-core/bin/hysteria/config/:/tpdata/trojan-panel-core/bin/hysteria/config/"
- "/tpdata/trojan-panel-core/bin/naiveproxy/config/:/tpdata/trojan-panel-core/bin/naiveproxy/config/"
- "/tpdata/trojan-panel-core/bin/hysteria2/config/:/tpdata/trojan-panel-core/bin/hysteria2/config/"
- "/tpdata/trojan-panel-core/logs/:/tpdata/trojan-panel-core/logs/"
- "/tpdata/trojan-panel-core/config/:/tpdata/trojan-panel-core/config/"
- "/tpdata/grizzly-core/bin/xray/config/:/tpdata/grizzly-core/bin/xray/config/"
- "/tpdata/grizzly-core/bin/trojango/config/:/tpdata/grizzly-core/bin/trojango/config/"
- "/tpdata/grizzly-core/bin/hysteria/config/:/tpdata/grizzly-core/bin/hysteria/config/"
- "/tpdata/grizzly-core/bin/naiveproxy/config/:/tpdata/grizzly-core/bin/naiveproxy/config/"
- "/tpdata/grizzly-core/bin/hysteria2/config/:/tpdata/grizzly-core/bin/hysteria2/config/"
- "/tpdata/grizzly-core/logs/:/tpdata/grizzly-core/logs/"
- "/tpdata/grizzly-core/config/:/tpdata/grizzly-core/config/"
- "/tpdata/cert/:/tpdata/cert/"
- "/tpdata/web/:/tpdata/web/"
- "/etc/localtime:/etc/localtime"
Expand All @@ -83,7 +83,7 @@ services:
- "mariadb_port=9507"
- "mariadb_user=root"
- "mariadb_pas=${mariadb_pas}"
- "database=trojan_panel_db"
- "database=grizzly_db"
- "account-table=account"
- "redis_host=127.0.0.1"
- "redis_port=6378"
Expand Down
Loading

0 comments on commit c650913

Please sign in to comment.