Pull PPA/Package install into a single file to bump build times.

util/docker/web/setup/00_packages.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+set -x
+
+# Group up several package installations here to reduce overall build time
+
+add-apt-repository -y ppa:chris-needham/ppa
+add-apt-repository -y ppa:sftpgo/sftpgo
+add-apt-repository -y ppa:ondrej/php
+
+apt-get update
+
+apt-get install -y --no-install-recommends \
+  audiowaveform \
+  nginx nginx-common openssl \
+  sftpgo \
+  tmpreaper \
+  zstd

util/docker/web/setup/audiowaveform.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-add-apt-repository -y ppa:chris-needham/ppa
-apt-get update
-
-apt-get install -y --no-install-recommends audiowaveform

util/docker/web/setup/nginx.sh

@@ -2,7 +2,7 @@
 set -e
 set -x
 
-apt-get install -y --no-install-recommends nginx nginx-common openssl
+# Package installation handled in 00_packages.sh
 
 # Install nginx and configuration
 cp /bd_build/web/nginx/proxy_params.conf /etc/nginx/proxy_params

util/docker/web/setup/php.sh

@@ -4,8 +4,7 @@ set -x
 
 PHP_VERSION=8.2
 
-add-apt-repository -y ppa:ondrej/php
-apt-get update
+# PPA set up in 00_packages.sh
 
 apt-get install -y --no-install-recommends php${PHP_VERSION}-fpm php${PHP_VERSION}-cli php${PHP_VERSION}-gd \
   php${PHP_VERSION}-curl php${PHP_VERSION}-xml php${PHP_VERSION}-zip php${PHP_VERSION}-bcmath \

util/docker/web/setup/sftpgo.sh

@@ -2,10 +2,7 @@
 set -e
 set -x
 
-add-apt-repository -y ppa:sftpgo/sftpgo
-apt-get update
-
-apt-get install -y --no-install-recommends sftpgo
+# Package installed in 00_packages.sh
 
 mkdir -p /var/azuracast/sftpgo/persist /var/azuracast/sftpgo/backups
 

util/docker/web/setup/tmpreaper.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-apt-get install -y --no-install-recommends tmpreaper

util/docker/web/setup/zstd.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-apt-get install -y --no-install-recommends zstd