From 08c911fd33a08ed1d0f208abd52edf9fe9b7f5ec Mon Sep 17 00:00:00 2001 From: Adnan RIHAN Date: Sun, 6 Apr 2025 15:06:31 +0200 Subject: [PATCH 1/3] Install `provision:update` pre-requisites --- recipe/provision.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/recipe/provision.php b/recipe/provision.php index b7aa9cef7..eeb38d779 100644 --- a/recipe/provision.php +++ b/recipe/provision.php @@ -123,6 +123,12 @@ task('provision:update', function () { set('remote_user', get('provision_user')); + // Update before installing anything + run('apt-get update', env: ['DEBIAN_FRONTEND' => 'noninteractive']); + + // Pre-requisites + run('apt install -y curl gpg software-properties-common', env: ['DEBIAN_FRONTEND' => 'noninteractive']); + // PHP run('apt-add-repository ppa:ondrej/php -y', env: ['DEBIAN_FRONTEND' => 'noninteractive']); From 6d4f3077e7e3ee3aa206794d1fb48dee99beda69 Mon Sep 17 00:00:00 2001 From: Adnan RIHAN Date: Sun, 6 Apr 2025 15:09:54 +0200 Subject: [PATCH 2/3] `add-apt-repository` is broken with non-UTF-8 locales See: https://github.com/oerdnj/deb.sury.org/issues/56#issuecomment-191748654 --- recipe/provision.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipe/provision.php b/recipe/provision.php index eeb38d779..c200faf33 100644 --- a/recipe/provision.php +++ b/recipe/provision.php @@ -130,7 +130,7 @@ run('apt install -y curl gpg software-properties-common', env: ['DEBIAN_FRONTEND' => 'noninteractive']); // PHP - run('apt-add-repository ppa:ondrej/php -y', env: ['DEBIAN_FRONTEND' => 'noninteractive']); + run('LC_ALL=C.UTF-8 apt-add-repository ppa:ondrej/php -y', env: ['DEBIAN_FRONTEND' => 'noninteractive']); // Caddy run("curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor --yes -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg"); From 15e0d93d03d715fde07c1ce7abc2708abe3fbe1b Mon Sep 17 00:00:00 2001 From: Adnan RIHAN Date: Sun, 6 Apr 2025 17:42:34 +0200 Subject: [PATCH 3/3] Moves env var to env --- recipe/provision.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipe/provision.php b/recipe/provision.php index c200faf33..ec97a26ee 100644 --- a/recipe/provision.php +++ b/recipe/provision.php @@ -130,7 +130,10 @@ run('apt install -y curl gpg software-properties-common', env: ['DEBIAN_FRONTEND' => 'noninteractive']); // PHP - run('LC_ALL=C.UTF-8 apt-add-repository ppa:ondrej/php -y', env: ['DEBIAN_FRONTEND' => 'noninteractive']); + run('apt-add-repository ppa:ondrej/php -y', env: [ + 'DEBIAN_FRONTEND' => 'noninteractive', + 'LC_ALL' => 'C.UTF-8', + ]); // Caddy run("curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor --yes -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg");