pterodactyl/development
1
0
Fork 0
mirror of https://github.com/pterodactyl/development.git synced 2025-12-11 04:38:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use PHP 7.4 for new development

Browse Source
This commit is contained in:
Dane Everitt 2020-03-17 21:33:38 -07:00
parent 7ecb4c314f
commit 848e5054c4
No known key found for this signature in database
GPG Key ID: EEA66103B3D71F53
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -82,6 +82,7 @@ Vagrant.configure("2") do |config|
wings.vm.synced_folder ".", "/vagrant", disabled: true
wings.vm.synced_folder "#{vagrant_root}/code/wings", "/home/vagrant/wings", owner: "vagrant", group: "vagrant"
wings.vm.synced_folder "#{vagrant_root}/code/sftp-server", "/home/vagrant/sftp-server", owner: "vagrant", group: "vagrant"
wings.vm.synced_folder "#{vagrant_root}/.data/certificates", "/etc/ssl/private", owner: "vagrant", group: "vagrant"
wings.vm.network :private_network, ip: "192.168.50.3"
@ -97,7 +98,6 @@ Vagrant.configure("2") do |config|
daemon.vm.synced_folder "#{vagrant_root}/code/daemon", "/srv/daemon", owner: "vagrant", group: "vagrant"
daemon.vm.synced_folder "#{vagrant_root}/.data/certificates", "/etc/ssl/private", owner: "vagrant", group: "vagrant"
daemon.vm.synced_folder "#{vagrant_root}/code/sftp-server", "/home/vagrant/sftp-server", owner: "vagrant", group: "vagrant"
daemon.vm.synced_folder ".data/daemon-data", "/srv/daemon-data", create: true
daemon.vm.network :private_network, ip: "192.168.50.4"

31
build/Dockerfile-panel
View File

@ -3,26 +3,26 @@ FROM quay.io/pterodactyl/vagrant-core
LABEL maintainer="dane@daneeveritt.com" \
description="Docker image allowing Pterodactyl Panel to run using Vagrant."
RUN curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - \
RUN curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash - \
&& curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \
&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list \
&& add-apt-repository -y ppa:ondrej/php \
&& apt -y update \
&& apt -y upgrade \
&& apt -y --no-install-recommends install software-properties-common \
php7.2 \
php7.2-cli \
php7.2-gd \
php7.2-mysql \
php7.2-pdo \
php7.2-mbstring \
php7.2-tokenizer \
php7.2-bcmath \
php7.2-xml \
php7.2-fpm \
php7.2-curl \
php7.2-zip \
php7.2-xdebug \
php7.4 \
php7.4-cli \
php7.4-gd \
php7.4-mysql \
php7.4-pdo \
php7.4-mbstring \
php7.4-tokenizer \
php7.4-bcmath \
php7.4-xml \
php7.4-fpm \
php7.4-curl \
php7.4-zip \
php7.4-xdebug \
nginx \
tar \
unzip \
@ -31,9 +31,10 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - \
cron \
nodejs \
yarn \
nano
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
&& rm -rf /var/lib/apt/lists/*
EXPOSE 80
ENTRYPOINT /usr/bin/supervisord && service ssh start && service cron start && /bin/bash
ENTRYPOINT /usr/bin/supervisord && service ssh start && service cron start && /bin/bash

2
build/configs/nginx/pterodactyl.test.conf
View File

@ -46,7 +46,7 @@ server {
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass unix:/var/run/php/php7.2-fpm.sock;
fastcgi_pass unix:/var/run/php/php7.4-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M";

4
build/configs/supervisor/pterodactyl.conf
View File

@ -9,7 +9,7 @@ redirect_stderr=true
stdout_logfile=/srv/www/storage/logs/supervisor-worker.log
[program:php-fpm]
command=/usr/sbin/php-fpm7.2 -F
command=/usr/sbin/php-fpm7.4 -F
autostart=true
autorestart=true
priority=5
@ -22,4 +22,4 @@ autostart=true
autorestart=true
priority=10
stdout_events_enabled=true
stderr_events_enabled=true
stderr_events_enabled=true

4
scripts/deploy_app.sh
View File

@ -36,7 +36,7 @@ rm -f /root/app
ln -s /srv/www /root/app
# Configure OPCache
cat >> /etc/php/7.2/cli/conf.d/10-opcache.ini <<EOF
cat >> /etc/php/7.4/cli/conf.d/10-opcache.ini <<EOF
opcache.revalidate_freq = 0
opcache.max_accelerated_files = 11003
opcache.memory_consumption = 192
@ -46,7 +46,7 @@ opcache.enable = 1
opcache.enable_cli = 1
EOF
cat >> /etc/php/7.2/fpm/conf.d/20-xdebug.ini <<EOF
cat >> /etc/php/7.4/fpm/conf.d/20-xdebug.ini <<EOF
xdebug.remote_enable = 1
xdebug.remote_host = host.docker.internal
xdebug.remote_port = 9000