From 9a19d9057b4f6b925f2a8a4a678efa038536c339 Mon Sep 17 00:00:00 2001 From: Jakob Schrettenbrunner Date: Sat, 9 Jan 2021 02:19:12 +0100 Subject: [PATCH] reverse symlink for app container some VS Code tooling doesn't handle symlinks very well... --- Vagrantfile | 6 +++--- scripts/deploy_app.sh | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 27124ca..183813d 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -47,12 +47,12 @@ Vagrant.configure("2") do |config| if ENV['FILE_SYNC_METHOD'] === 'docker-sync' d.volumes = [ - "panel-sync:/srv/www:nocopy", + "panel-sync:/root/app:nocopy", "#{vagrant_root}/.data/certificates:/etc/ssl/private:ro" ] else d.volumes = [ - "#{vagrant_root}/code/panel:/srv/www:cached", + "#{vagrant_root}/code/panel:/root/app:cached", "#{vagrant_root}/.data/certificates:/etc/ssl/private:ro" ] end @@ -66,7 +66,7 @@ Vagrant.configure("2") do |config| app.vm.provision "deploy_supervisor_config", type: "file", source: "#{vagrant_root}/build/configs/supervisor/pterodactyl.conf", destination: "/tmp/.deploy/supervisor/pterodactyl.conf" app.vm.provision "configure_application", type: "shell", path: "#{vagrant_root}/scripts/deploy_app.sh" app.vm.provision "setup", type: "shell", run: "never", inline: <<-SHELL - cd /srv/www + cd /root/app cp .env .env.bkup php artisan key:generate --force --no-interaction diff --git a/scripts/deploy_app.sh b/scripts/deploy_app.sh index 0846269..fe4282f 100644 --- a/scripts/deploy_app.sh +++ b/scripts/deploy_app.sh @@ -10,7 +10,7 @@ mkdir -p /run/php # Disable xdebug on the CLI for _MASSIVE_ performance improvement phpdismod -s cli xdebug -cd /srv/www +cd /root/app chmod -R 755 storage/* bootstrap/cache chown -R www-data:www-data storage @@ -29,11 +29,11 @@ composer install --no-interaction --prefer-dist --no-suggest --no-scripts --no-p php artisan config:clear # Configure the cronjob -(crontab -l 2>/dev/null; echo "* * * * * php /srv/www/artisan schedule:run >> /dev/null 2>&1") | crontab - +(crontab -l 2>/dev/null; echo "* * * * * php /root/app/artisan schedule:run >> /dev/null 2>&1") | crontab - # Create symlink rm -f /root/app -ln -s /srv/www /root/app +ln -s /root/app /srv/www # Configure OPCache cat >> /etc/php/7.4/cli/conf.d/10-opcache.ini <