No longer need mutagen with docker updates; set default environment better

This commit is contained in:
DaneEveritt 2022-05-04 18:38:57 -04:00
parent 2d4d36c3d4
commit 869d7d6450
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
2 changed files with 11 additions and 19 deletions

4
beak
View File

@ -12,10 +12,10 @@ elif [ "$1" == "wings" ]; then
docker compose exec -u root wings bash
elif [ "$1" == "up" ]; then
shift
mutagen-compose up $@
docker compose up $@
elif [ "$1" == "down" ]; then
shift
mutagen-compose down $@
docker compose down $@
else
echo "./beak.sh <up|down|wings|app> [root]"
exit 1

View File

@ -31,7 +31,7 @@ services:
aliases:
- pterodactyl.test
volumes:
- panel_code:/var/www/html
- ./code/panel:/var/www/html
- ./docker/certificates:/etc/certs:ro
- ./docker/php:/etc/php/mods-available:ro
labels:
@ -46,6 +46,14 @@ services:
- "traefik.http.routers.webpack-dev-server.entrypoints=https"
- "traefik.http.routers.webpack-dev-server.service=webpack-dev-server"
- "traefik.http.services.webpack-dev-server.loadbalancer.server.port=8080"
environment:
APP_URL: https://pterodactyl.test
DB_HOST: mysql
REDIS_HOST: redis
DB_USERNAME: pterodactyl
DB_PASSWORD: pterodactyl
SESSION_DRIVER: redis
CACHE_DRIVER: redis
wings:
image: ghcr.io/pterodactyl/development/wings:latest
# build:
@ -129,25 +137,9 @@ networks:
driver: bridge
volumes:
panel_code:
mysql:
driver: local
minio:
driver: local
go_modules:
driver: local
x-mutagen:
sync:
defaults:
permissions:
defaultFileMode: 0666
defaultDirectoryMode: 0777
code:
alpha: "./code/panel"
beta: "volume://panel_code"
mode: "two-way-resolved"
ignore:
vcs: true
paths:
- ".idea"