From f0deeb24b67fd3fe9fa423b2ea9ad0e79cf05c98 Mon Sep 17 00:00:00 2001 From: Bozhidar Date: Wed, 15 May 2024 01:30:35 +0300 Subject: [PATCH] update --- .drone-extend.yml | 4 ++-- .drone.yml | 6 ++--- .drone.yml.orig | 4 ++-- .github/workflows/app-code-coverage.yml_ | 22 +++++++++---------- docker/Dockerfile | 2 +- .../install-partial/install_base.sh | 2 +- .../install-partial/install_base.sh | 2 +- installers/ubuntu-20.04/install.sh | 2 +- .../install-partial/install_base.sh | 2 +- installers/ubuntu-22.04/install.sh | 2 +- .../Minecraft/shell-scripts/install-docker.sh | 2 +- .../Server/Applications/DovecotInstaller.php | 4 ++-- .../Server/Applications/NodeJsInstaller.php | 5 +++-- .../Server/Applications/PHPInstaller.php | 5 +++-- .../Server/Applications/PythonInstaller.php | 13 ++++++----- .../Server/Applications/RubyInstaller.php | 9 ++++---- 16 files changed, 45 insertions(+), 41 deletions(-) diff --git a/.drone-extend.yml b/.drone-extend.yml index d0ddf01..53e63b2 100644 --- a/.drone-extend.yml +++ b/.drone-extend.yml @@ -8,7 +8,7 @@ steps: - sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-* - sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-* - yum update -y - - dnf -y install sudo wget + - dnf -yq install sudo wget - sudo wget -q -O - http://www.atomicorp.com/installers/atomic | sh - mkdir /phyre-panel @@ -38,7 +38,7 @@ steps: DEBIAN_FRONTEND: noninteractive commands: - apt-get update - - apt-get install -y libicu-dev sudo cron apt-utils -yqq daemonize dbus-user-session fontconfig rsync + - apt-get install -yq libicu-dev sudo cron apt-utils -yqq daemonize dbus-user-session fontconfig rsync - daemonize /usr/bin/unshare --fork --pid --mount-proc /lib/systemd/systemd --system-unit=basic.target - mkdir /phyre-panel diff --git a/.drone.yml b/.drone.yml index f151d16..5abaa13 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,7 @@ steps: - service mysql start - service phyre start - MAIN_REPO_DIR=$(pwd) - - apt-get install -y rsync + - apt-get install -yq rsync - cp /usr/local/phyre/web/phyre-config.ini /usr/local/phyre/phyre-config.ini.bak - rm -rf /usr/local/phyre/web - cp -r $MAIN_REPO_DIR/web /usr/local/phyre/web @@ -37,7 +37,7 @@ steps: - export DEBIAN_FRONTEND=noninteractive - MAIN_REPO_DIR=$(pwd) - apt-get update - - apt-get install -y libicu-dev sudo cron apt-utils -yqq daemonize dbus-user-session fontconfig rsync + - apt-get install -yq libicu-dev sudo cron apt-utils -yqq daemonize dbus-user-session fontconfig rsync - daemonize /usr/bin/unshare --fork --pid --mount-proc /lib/systemd/systemd --system-unit=basic.target - ls -la @@ -87,6 +87,6 @@ steps: - mv clover.xml $MAIN_REPO_DIR/clover.xml - mv coverage.xml $MAIN_REPO_DIR/coverage.xml - cd $MAIN_REPO_DIR - - apt install -y pip + - apt install -yq pip - pip install codecov-cli - codecovcli --verbose upload-process -t $CODECOV_TOKEN diff --git a/.drone.yml.orig b/.drone.yml.orig index 5671124..f3dbaeb 100644 --- a/.drone.yml.orig +++ b/.drone.yml.orig @@ -11,7 +11,7 @@ steps: commands: - MAIN_REPO_DIR=$(pwd) - apt-get update - - apt-get install -y libicu-dev sudo cron apt-utils -yqq daemonize dbus-user-session fontconfig rsync + - apt-get install -yq libicu-dev sudo cron apt-utils -yqq daemonize dbus-user-session fontconfig rsync - daemonize /usr/bin/unshare --fork --pid --mount-proc /lib/systemd/systemd --system-unit=basic.target - ls -la @@ -60,6 +60,6 @@ steps: - mv clover.xml $MAIN_REPO_DIR/clover.xml - mv coverage.xml $MAIN_REPO_DIR/coverage.xml - cd $MAIN_REPO_DIR - - apt install -y pip + - apt install -yq pip - pip install codecov-cli - codecovcli --verbose upload-process -t $CODECOV_TOKEN diff --git a/.github/workflows/app-code-coverage.yml_ b/.github/workflows/app-code-coverage.yml_ index 4839f5f..99a4d72 100644 --- a/.github/workflows/app-code-coverage.yml_ +++ b/.github/workflows/app-code-coverage.yml_ @@ -23,27 +23,27 @@ jobs: run: | ls -la sudo mkdir /phyre-panel - + sudo cp installers/${{ matrix.os }}/install-partial/install_base.sh /phyre-panel/install_base.sh sudo chmod +x /phyre-panel/install_base.sh sudo /phyre-panel/install_base.sh - + sudo cp installers/${{ matrix.os }}/install-partial/install_web.sh /phyre-panel/install_web.sh sudo chmod +x /phyre-panel/install_web.sh - name: Run Code Coverage run: | - + sudo cp -r web /usr/local/phyre/web/ cd /usr/local/phyre/web/ ls -la - + sudo wget https://getcomposer.org/download/latest-stable/composer.phar sudo COMPOSER_ALLOW_SUPERUSER=1 phyre-php composer.phar install - + sudo /phyre-panel/install_web.sh - - sudo apt-get install autoconf build-essential -y + + sudo apt-get install autoconf build-essential -yq sudo mkdir -p /usr/local/phyre/php-xdebug cd /usr/local/phyre/php-xdebug sudo wget http://xdebug.org/files/xdebug-3.3.2.tgz @@ -52,17 +52,17 @@ jobs: sudo /usr/local/phyre/php/bin/phpize sudo ./configure --enable-xdebug --with-php-config=/usr/local/phyre/php/bin/php-config sudo make - + sudo mkdir -p /usr/local/phyre/php/zend-xdebug sudo cp modules/xdebug.so /usr/local/phyre/php/zend-xdebug/xdebug.so sudo chmod 777 /usr/local/phyre/php/zend-xdebug/xdebug.so - + sudo cp /usr/local/phyre/web/tests/xdebug-php-ini.txt /usr/local/phyre/php/bin/php.ini - + sudo chmod 777 /usr/local/phyre/php/bin/php.ini phyre-php -v - + cd /usr/local/phyre/web/ sudo chmod -R 777 vendor apt install composer -y diff --git a/docker/Dockerfile b/docker/Dockerfile index 09b5fc0..1050a64 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 AS production -RUN apt-get update && apt-get install -y wget +RUN apt-get update && apt-get install -yq wget RUN ls -la RUN wget https://raw.githubusercontent.com/PhyreApps/PhyrePanel/main/installers/install.sh -O phyre-install.sh RUN chmod +x phyre-install.sh diff --git a/installers/centos-stream-9/install-partial/install_base.sh b/installers/centos-stream-9/install-partial/install_base.sh index 9fbff3c..4aa6c35 100644 --- a/installers/centos-stream-9/install-partial/install_base.sh +++ b/installers/centos-stream-9/install-partial/install_base.sh @@ -35,7 +35,7 @@ DEPENDENCIES_LIST=( ) # Check if the dependencies are installed for DEPENDENCY in "${DEPENDENCIES_LIST[@]}"; do - yum install -y $DEPENDENCY + yum install -yq $DEPENDENCY done # Start MySQL diff --git a/installers/ubuntu-20.04/install-partial/install_base.sh b/installers/ubuntu-20.04/install-partial/install_base.sh index 3e1b1ea..c5c5d29 100644 --- a/installers/ubuntu-20.04/install-partial/install_base.sh +++ b/installers/ubuntu-20.04/install-partial/install_base.sh @@ -35,7 +35,7 @@ DEPENDENCIES_LIST=( ) # Check if the dependencies are installed for DEPENDENCY in "${DEPENDENCIES_LIST[@]}"; do - apt install -y $DEPENDENCY + apt install -yq $DEPENDENCY done # Start MySQL diff --git a/installers/ubuntu-20.04/install.sh b/installers/ubuntu-20.04/install.sh index df81252..c7693df 100644 --- a/installers/ubuntu-20.04/install.sh +++ b/installers/ubuntu-20.04/install.sh @@ -35,7 +35,7 @@ DEPENDENCIES_LIST=( ) # Check if the dependencies are installed for DEPENDENCY in "${DEPENDENCIES_LIST[@]}"; do - apt install -y $DEPENDENCY + apt install -yq $DEPENDENCY done # Start MySQL diff --git a/installers/ubuntu-22.04/install-partial/install_base.sh b/installers/ubuntu-22.04/install-partial/install_base.sh index 9a78935..870a3bc 100644 --- a/installers/ubuntu-22.04/install-partial/install_base.sh +++ b/installers/ubuntu-22.04/install-partial/install_base.sh @@ -35,7 +35,7 @@ DEPENDENCIES_LIST=( ) # Check if the dependencies are installed for DEPENDENCY in "${DEPENDENCIES_LIST[@]}"; do - apt install -y $DEPENDENCY + apt install -yq $DEPENDENCY done # Start MySQL diff --git a/installers/ubuntu-22.04/install.sh b/installers/ubuntu-22.04/install.sh index de71893..68661a1 100644 --- a/installers/ubuntu-22.04/install.sh +++ b/installers/ubuntu-22.04/install.sh @@ -35,7 +35,7 @@ DEPENDENCIES_LIST=( ) # Check if the dependencies are installed for DEPENDENCY in "${DEPENDENCIES_LIST[@]}"; do - apt install -y $DEPENDENCY + apt install -yq $DEPENDENCY done # Start MySQL diff --git a/web/Modules/Minecraft/shell-scripts/install-docker.sh b/web/Modules/Minecraft/shell-scripts/install-docker.sh index 5897ec7..2c1efc0 100644 --- a/web/Modules/Minecraft/shell-scripts/install-docker.sh +++ b/web/Modules/Minecraft/shell-scripts/install-docker.sh @@ -21,7 +21,7 @@ DEPENDENCIES_LIST=( ) for DEPENDENCY in "${DEPENDENCIES_LIST[@]}"; do - sudo apt install -y $DEPENDENCY + sudo apt install -yq $DEPENDENCY done echo "Done!" diff --git a/web/app/Installers/Server/Applications/DovecotInstaller.php b/web/app/Installers/Server/Applications/DovecotInstaller.php index eddf5db..68bd5f9 100644 --- a/web/app/Installers/Server/Applications/DovecotInstaller.php +++ b/web/app/Installers/Server/Applications/DovecotInstaller.php @@ -19,13 +19,13 @@ class DovecotInstaller $commands[] = 'echo "Installing dovecot..."'; // postfix - internet site - $commands[] = 'apt-get install -y telnet exim4 dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd'; + $commands[] = 'apt-get install -yq telnet exim4 dovecot-core dovecot-imapd dovecot-pop3d dovecot-lmtpd'; // /var/lib/roundcube // wget https://github.com/roundcube/roundcubemail/releases/download/1.6.0/roundcubemail-1.6.0-complete.tar.gz - // $commands[] = 'apt-get install -y roundcube roundcube-core roundcube-mysql roundcube-plugins'; + // $commands[] = 'apt-get install -yq roundcube roundcube-core roundcube-mysql roundcube-plugins'; $shellFileContent = ''; foreach ($commands as $command) { diff --git a/web/app/Installers/Server/Applications/NodeJsInstaller.php b/web/app/Installers/Server/Applications/NodeJsInstaller.php index e46f461..49fc5d4 100644 --- a/web/app/Installers/Server/Applications/NodeJsInstaller.php +++ b/web/app/Installers/Server/Applications/NodeJsInstaller.php @@ -21,7 +21,8 @@ class NodeJsInstaller public function install() { $commands = []; - $commands[] = 'apt-get install -y npm'; + $commands[] = 'export DEBIAN_FRONTEND=noninteractive'; + $commands[] = 'apt-get install -yq npm'; $commands[] = 'curl -sL https://deb.nodesource.com/setup_20.x -o /tmp/nodesource_setup.sh'; $commands[] = 'bash /tmp/nodesource_setup.sh'; $commands[] = 'apt-get install nodejs -y'; @@ -30,7 +31,7 @@ class NodeJsInstaller $commands[] = 'curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null'; $commands[] = "sudo sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger jammy main > /etc/apt/sources.list.d/passenger.list'"; $commands[] = 'apt-get update'; - $commands[] = 'sudo apt-get install -y libapache2-mod-passenger'; + $commands[] = 'sudo apt-get install -yq libapache2-mod-passenger'; $commands[] = 'sudo a2enmod passenger'; $commands[] = 'sudo service apache2 restart'; diff --git a/web/app/Installers/Server/Applications/PHPInstaller.php b/web/app/Installers/Server/Applications/PHPInstaller.php index 72162a3..ad319e9 100644 --- a/web/app/Installers/Server/Applications/PHPInstaller.php +++ b/web/app/Installers/Server/Applications/PHPInstaller.php @@ -27,7 +27,8 @@ class PHPInstaller { $commands = []; $commands[] = 'echo "Starting PHP Installation..."'; - $commands[] = 'apt-get install -y sudo'; + $commands[] = 'export DEBIAN_FRONTEND=noninteractive'; + $commands[] = 'apt-get install -yq sudo'; $commands[] = 'add-apt-repository -y ppa:ondrej/php'; $commands[] = 'add-apt-repository -y ppa:ondrej/apache2'; @@ -51,7 +52,7 @@ class PHPInstaller $dependencies = implode(' ', $dependenciesList); - $commands[] = 'apt-get install -y ' . $dependencies; + $commands[] = 'apt-get install -yq ' . $dependencies; $lastItem = end($this->phpVersions); foreach ($this->phpVersions as $phpVersion) { diff --git a/web/app/Installers/Server/Applications/PythonInstaller.php b/web/app/Installers/Server/Applications/PythonInstaller.php index 517ba4e..8b1488d 100644 --- a/web/app/Installers/Server/Applications/PythonInstaller.php +++ b/web/app/Installers/Server/Applications/PythonInstaller.php @@ -21,19 +21,20 @@ class PythonInstaller public function install() { $commands = []; + $commands[] = 'export DEBIAN_FRONTEND=noninteractive'; foreach ($this->pythonVersions as $pythonVersion) { - $commands[] = 'apt-get install -y python' . $pythonVersion; - $commands[] = 'apt-get install -y python' . $pythonVersion . '-dev'; - $commands[] = 'apt-get install -y python' . $pythonVersion . '-venv'; - $commands[] = 'apt-get install -y python' . $pythonVersion . '-setuptools'; - $commands[] = 'apt-get install -y python' . $pythonVersion . '-wheel'; + $commands[] = 'apt-get install -yq python' . $pythonVersion; + $commands[] = 'apt-get install -yq python' . $pythonVersion . '-dev'; + $commands[] = 'apt-get install -yq python' . $pythonVersion . '-venv'; + $commands[] = 'apt-get install -yq python' . $pythonVersion . '-setuptools'; + $commands[] = 'apt-get install -yq python' . $pythonVersion . '-wheel'; } // Install Apache Passenger $commands[] = 'curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null'; $commands[] = "sudo sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger jammy main > /etc/apt/sources.list.d/passenger.list'"; $commands[] = 'apt-get update'; - $commands[] = 'sudo apt-get install -y libapache2-mod-passenger'; + $commands[] = 'sudo apt-get install -yq libapache2-mod-passenger'; $commands[] = 'sudo a2enmod passenger'; $commands[] = 'sudo service apache2 restart'; diff --git a/web/app/Installers/Server/Applications/RubyInstaller.php b/web/app/Installers/Server/Applications/RubyInstaller.php index bef7053..3a6ef34 100644 --- a/web/app/Installers/Server/Applications/RubyInstaller.php +++ b/web/app/Installers/Server/Applications/RubyInstaller.php @@ -21,17 +21,18 @@ class RubyInstaller public function install() { $commands = []; + $commands[] = 'export DEBIAN_FRONTEND=noninteractive'; foreach ($this->rubyVersions as $rubyVersion) { - $commands[] = 'apt-get install -y ruby' . $rubyVersion; - $commands[] = 'apt-get install -y ruby' . $rubyVersion . '-dev'; - $commands[] = 'apt-get install -y ruby' . $rubyVersion . '-bundler'; + $commands[] = 'apt-get install -yq ruby' . $rubyVersion; + $commands[] = 'apt-get install -yq ruby' . $rubyVersion . '-dev'; + $commands[] = 'apt-get install -yq ruby' . $rubyVersion . '-bundler'; } // Install Apache Passenger $commands[] = 'curl https://oss-binaries.phusionpassenger.com/auto-software-signing-gpg-key.txt | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/phusion.gpg >/dev/null'; $commands[] = "sudo sh -c 'echo deb https://oss-binaries.phusionpassenger.com/apt/passenger jammy main > /etc/apt/sources.list.d/passenger.list'"; $commands[] = 'apt-get update'; - $commands[] = 'sudo apt-get install -y libapache2-mod-passenger'; + $commands[] = 'sudo apt-get install -yq libapache2-mod-passenger'; $commands[] = 'sudo a2enmod passenger'; $commands[] = 'sudo service apache2 restart';