diff --git a/composer.json b/composer.json index d173bb70c..c4918080e 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^8.0", + "php": "^8.1", "ext-PDO": "*", "ext-fileinfo": "*", "ext-gd": "*", diff --git a/update.sh b/update.sh index 98ef49a1a..a44f5ed5a 100755 --- a/update.sh +++ b/update.sh @@ -34,7 +34,7 @@ else fi APP_ENV="${APP_ENV:-production}" -UPDATE_REVISION="${UPDATE_REVISION:-67}" +UPDATE_REVISION="${UPDATE_REVISION:-68}" echo "Updating AzuraCast (Environment: $APP_ENV, Update revision: $UPDATE_REVISION)" diff --git a/util/ansible/roles/php/tasks/main.yml b/util/ansible/roles/php/tasks/main.yml index 70132a449..b0e25a192 100644 --- a/util/ansible/roles/php/tasks/main.yml +++ b/util/ansible/roles/php/tasks/main.yml @@ -57,33 +57,46 @@ - php7.4-bcmath - php7.4-gmp - php7.4-maxminddb + - php8.0-fpm + - php8.0-cli + - php8.0-gd + - php8.0-curl + - php8.0-xml + - php8.0-zip + - php8.0-mysqlnd + - php8.0-mbstring + - php8.0-intl + - php8.0-redis + - php8.0-bcmath + - php8.0-gmp + - php8.0-maxminddb -- name : Install PHP 8.0 +- name : Install PHP 8.1 apt : name : "{{ packages }}" state : latest vars : packages : - - php8.0-fpm - - php8.0-cli - - php8.0-gd - - php8.0-curl - - php8.0-xml # IceCast XML config - - php8.0-zip # Composer installs - - php8.0-mysqlnd # MySQL Native Driver (Doctrine) - - php8.0-mbstring # Codeception Tests - - php8.0-intl # Localization - - php8.0-redis # Cache - - php8.0-bcmath # BigInteger - - php8.0-gmp # BigInteger and PHP-IP - - php8.0-maxminddb # Maxmind (GeoIP) DB native ext + - php8.1-fpm + - php8.1-cli + - php8.1-gd + - php8.1-curl + - php8.1-xml # IceCast XML config + - php8.1-zip # Composer installs + - php8.1-mysqlnd # MySQL Native Driver (Doctrine) + - php8.1-mbstring # Codeception Tests + - php8.1-intl # Localization + - php8.1-redis # Cache + - php8.1-bcmath # BigInteger + - php8.1-gmp # BigInteger and PHP-IP + - php8.1-maxminddb # Maxmind (GeoIP) DB native ext - name: Configure PHP FPM Pool - template : src=fpmpool.j2 dest=/etc/php/8.0/fpm/pool.d/www.conf force=true + template : src=fpmpool.j2 dest=/etc/php/8.1/fpm/pool.d/www.conf force=true - name: Configure php-fpm php.ini ini_file: - dest : /etc/php/8.0/fpm/php.ini + dest : /etc/php/8.1/fpm/php.ini section: PHP option: "{{ item.option }}" value: "{{ item.value }}" @@ -94,7 +107,7 @@ - name: Configure php-cli php.ini ini_file: - dest : /etc/php/8.0/cli/php.ini + dest : /etc/php/8.1/cli/php.ini section: PHP option: "{{ item.option }}" value: "{{ item.value }}" diff --git a/util/ansible/update.yml b/util/ansible/update.yml index 1167dca6e..0ee190c9f 100644 --- a/util/ansible/update.yml +++ b/util/ansible/update.yml @@ -22,7 +22,7 @@ - { role : nginx, when : update_revision|int < 60 } - { role : redis, when : update_revision|int < 57 } - { role: beanstalkd, when: update_revision|int < 67 } - - { role : php, when : update_revision|int < 62 } + - { role : php, when : update_revision|int < 68 } - composer - { role : influxdb, when : update_revision|int < 58 } - { role : ufw, when : update_revision|int < 12 } diff --git a/util/docker/web/setup/php.sh b/util/docker/web/setup/php.sh index 9496c04df..e2e252970 100644 --- a/util/docker/web/setup/php.sh +++ b/util/docker/web/setup/php.sh @@ -3,7 +3,7 @@ set -e source /bd_build/buildconfig set -x -PHP_VERSION=8.0 +PHP_VERSION=8.1 add-apt-repository -y ppa:ondrej/php apt-get update