From 84d25adc3b959632a2f0f4a0251e6791361f197a Mon Sep 17 00:00:00 2001
From: Buster Neece <buster@busterneece.com>
Date: Thu, 12 Jan 2023 16:53:22 -0600
Subject: [PATCH] Pull PPA/Package install into a single file to bump build
 times.

---
 util/docker/web/setup/00_packages.sh   | 18 ++++++++++++++++++
 util/docker/web/setup/audiowaveform.sh |  8 --------
 util/docker/web/setup/nginx.sh         |  2 +-
 util/docker/web/setup/php.sh           |  3 +--
 util/docker/web/setup/sftpgo.sh        |  5 +----
 util/docker/web/setup/tmpreaper.sh     |  5 -----
 util/docker/web/setup/zstd.sh          |  5 -----
 7 files changed, 21 insertions(+), 25 deletions(-)
 create mode 100644 util/docker/web/setup/00_packages.sh
 delete mode 100644 util/docker/web/setup/audiowaveform.sh
 delete mode 100644 util/docker/web/setup/tmpreaper.sh
 delete mode 100644 util/docker/web/setup/zstd.sh

diff --git a/util/docker/web/setup/00_packages.sh b/util/docker/web/setup/00_packages.sh
new file mode 100644
index 000000000..44e33b265
--- /dev/null
+++ b/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
diff --git a/util/docker/web/setup/audiowaveform.sh b/util/docker/web/setup/audiowaveform.sh
deleted file mode 100644
index 494fc5005..000000000
--- a/util/docker/web/setup/audiowaveform.sh
+++ /dev/null
@@ -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
diff --git a/util/docker/web/setup/nginx.sh b/util/docker/web/setup/nginx.sh
index 332543be9..c1f4b80b5 100644
--- a/util/docker/web/setup/nginx.sh
+++ b/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
diff --git a/util/docker/web/setup/php.sh b/util/docker/web/setup/php.sh
index 519b853ca..b80c29504 100644
--- a/util/docker/web/setup/php.sh
+++ b/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 \
diff --git a/util/docker/web/setup/sftpgo.sh b/util/docker/web/setup/sftpgo.sh
index c87764480..9d573309a 100644
--- a/util/docker/web/setup/sftpgo.sh
+++ b/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
 
diff --git a/util/docker/web/setup/tmpreaper.sh b/util/docker/web/setup/tmpreaper.sh
deleted file mode 100644
index b97592fd3..000000000
--- a/util/docker/web/setup/tmpreaper.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-apt-get install -y --no-install-recommends tmpreaper
diff --git a/util/docker/web/setup/zstd.sh b/util/docker/web/setup/zstd.sh
deleted file mode 100644
index 9980fcc0b..000000000
--- a/util/docker/web/setup/zstd.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-set -e
-set -x
-
-apt-get install -y --no-install-recommends zstd