From 47c100de2f1270f980aaf3cbba59c4cd4d4b9503 Mon Sep 17 00:00:00 2001 From: "Michael (Parker) Parker" Date: Tue, 14 Aug 2018 00:01:25 -0400 Subject: [PATCH] latest changes --- .dev/docker/README.md | 4 ++-- .dev/docker/www.conf | 4 +++- docker-compose.yml | 11 +++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.dev/docker/README.md b/.dev/docker/README.md index b4d97ca36..db10d5315 100644 --- a/.dev/docker/README.md +++ b/.dev/docker/README.md @@ -17,11 +17,11 @@ Start the docker container and the required dependencies (either provide existin After the startup is complete you'll need to create a user. If you are running the docker container without docker-compose, use: ``` -docker exec -it php artisan pterodactyl:user +docker exec -it php artisan p:user:make ``` If you are using docker compose use ``` -docker-compose exec panel php artisan pterodactyl:user +docker-compose exec panel php artisan p:user:make ``` ## Environment Variables diff --git a/.dev/docker/www.conf b/.dev/docker/www.conf index 808180b9c..88142564c 100644 --- a/.dev/docker/www.conf +++ b/.dev/docker/www.conf @@ -11,4 +11,6 @@ listen.mode = 0750 pm = ondemand pm.max_children = 9 pm.process_idle_timeout = 10s -pm.max_requests = 200 \ No newline at end of file +pm.max_requests = 200 + +clear_env = no \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 4ba268368..aaf27562b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,7 @@ version: '2' services: database: + hostname: database image: mariadb volumes: - "/srv/pterodactyl/database:/var/lib/mysql" @@ -11,6 +12,7 @@ services: - "MYSQL_PASSWORD=pterodbpass" cache: + hostname: redis image: redis:alpine panel: @@ -23,7 +25,6 @@ services: - cache volumes: - "/srv/pterodactyl/var/:/app/var/" - - "/srv/pterodactyl/certs/:/" environment: ## These are defaults and should be left alone - "APP_ENV=production" @@ -61,4 +62,10 @@ services: - "MAIL_PORT=1025" - "MAIL_USERNAME=''" - "MAIL_PASSWORD=''" - - "MAIL_ENCRYPTION=true" \ No newline at end of file + - "MAIL_ENCRYPTION=true" + +networks: + default: + ipam: + config: + - subnet: 172.20.0.0/16