diff --git a/APKBUILD b/APKBUILD index 8e596d6..7705b95 100644 --- a/APKBUILD +++ b/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: LinuxSquare pkgname=pterodactyl-panel-compose pkgver=1.11.10 -pkgrel=2 +pkgrel=3 pkgdesc="The Pterodactyl Panel" arch="x86_64" url="https://pterodactyl.io/" diff --git a/Makefile b/Makefile index ab2f66c..61ecbb4 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ install-compose: sed -i "s|%APP_TIMEZONE%|$(APP_TIMEZONE)|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/pterodactyl-panel.sh" sed -i "s|%MYSQL_PASSWORD%|$(MYSQL_PASSWORD)|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/pterodactyl-panel.sh" sed -i "s|%MYSQL_ROOT_PASSWORD%|$(MYSQL_ROOT_PASSWORD)|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/pterodactyl-panel.sh" + sed -i "s|%SHARE_DIR%|$(SHARE_DIR)/pterodactyl-panel|g" "$(DESTDIR)$(SHARE_DIR)/pterodactyl-panel/pterodactyl-panel.sh" install-service: install -vDm 755 pterodactyl-panel-compose.initd.in "$(DESTDIR)/etc/init.d/pterodactyl-panel-compose" diff --git a/pterodactyl-panel.sh.in b/pterodactyl-panel.sh.in index bb65c7d..c169deb 100755 --- a/pterodactyl-panel.sh.in +++ b/pterodactyl-panel.sh.in @@ -2,9 +2,9 @@ start() { mkdir database var nginx certs logs || true - docker run --rm --network=host -d --name "pterodactyl-db" -v ./database:/var/lib/mysql -e MYSQL_DATABASE="panel" -e MYSQL_USER="pterodactyl" -e MYSQL_PASSWORD="%MYSQL_PASSWORD%" -e MYSQL_ROOT_PASSWORD="%MYSQL_ROOT_PASSWORD%" docker.io/mariadb:10.5 --default-authentication-plugin=mysql_native_password + docker run --rm --network=host -d --name "pterodactyl-db" -v %SHARE_DIR%/database:/var/lib/mysql -e MYSQL_DATABASE="panel" -e MYSQL_USER="pterodactyl" -e MYSQL_PASSWORD="%MYSQL_PASSWORD%" -e MYSQL_ROOT_PASSWORD="%MYSQL_ROOT_PASSWORD%" docker.io/mariadb:10.5 --default-authentication-plugin=mysql_native_password docker run --rm --network=host -d --name "pterodactyl-cache" docker.io/redis:alpine - docker run --rm --network=host -d --name "pterodactyl-panel" -v ./var:/app/var -v ./nginx:/etc/nginx/http.d -v ./certs:/etc/letsencrypt -v ./logs:/app/storage/logs -e DB_PASSWORD="%MYSQL_PASSWORD%" -e APP_ENV="production" -e APP_ENVIRONMENT_ONLY="false" -e CACHE_DRIVER="redis" -e SESSION_DRIVER="redis" -e QUEUE_DRIVER="redis" -e REDIS_HOST="$1" -e DB_HOST="$1" -e DB_PORT="3306" -e TRUSTED_PROXIES="*" -e APP_TIMEZONE="%APP_TIMEZONE%" -e APP_SERVICE_AUTHOR="mail@example.com" ghcr.io/pterodactyl/panel:v%VERSION% + docker run --rm --network=host -d --name "pterodactyl-panel" -v %SHARE_DIR%/var:/app/var -v %SHARE_DIR%/nginx:/etc/nginx/http.d -v %SHARE_DIR%/certs:/etc/letsencrypt -v %SHARE_DIR%/logs:/app/storage/logs -e DB_PASSWORD="%MYSQL_PASSWORD%" -e APP_ENV="production" -e APP_ENVIRONMENT_ONLY="false" -e CACHE_DRIVER="redis" -e SESSION_DRIVER="redis" -e QUEUE_DRIVER="redis" -e REDIS_HOST="$1" -e DB_HOST="$1" -e DB_PORT="3306" -e TRUSTED_PROXIES="*" -e APP_TIMEZONE="%APP_TIMEZONE%" -e APP_SERVICE_AUTHOR="mail@example.com" ghcr.io/pterodactyl/panel:v%VERSION% } stop() {