From ac60f541421aaec7af980219b712ad05c8f62b5f Mon Sep 17 00:00:00 2001
From: Hyperling <me@hyperling.com>
Date: Mon, 16 Jun 2025 17:17:47 -0600
Subject: [PATCH] Move the most important fixes to a Docker build file.
 `fixes.sh` is now just a list of maintenance jobs, name it so. Hooray!!

---
 Config/Nextcloud/Dockerfile                   | 11 +++++++
 Config/Nextcloud/docker-compose.micro.yml     |  3 +-
 Config/Nextcloud/docker-compose.standard.yml  |  3 +-
 Config/Nextcloud/{fixes.sh => maintenance.sh} | 29 ++++++++++---------
 4 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 Config/Nextcloud/Dockerfile
 rename Config/Nextcloud/{fixes.sh => maintenance.sh} (75%)

diff --git a/Config/Nextcloud/Dockerfile b/Config/Nextcloud/Dockerfile
new file mode 100644
index 0000000..8f105d0
--- /dev/null
+++ b/Config/Nextcloud/Dockerfile
@@ -0,0 +1,11 @@
+# 2025-06-16 Hyperling
+# Tired of running fixes.sh to install extra packages. Bake them in!
+
+FROM nextcloud:stable
+
+# Cache System Dependencies
+RUN apt-get update && apt-get install -y sudo libmagickcore-6.q16-6-extra htop \
+    iputils-ping dnsutils vim bzip2 libbz2-dev
+
+# Configure PHP Dependency
+RUN docker-php-ext-install bz2
diff --git a/Config/Nextcloud/docker-compose.micro.yml b/Config/Nextcloud/docker-compose.micro.yml
index ec88316..339f906 100644
--- a/Config/Nextcloud/docker-compose.micro.yml
+++ b/Config/Nextcloud/docker-compose.micro.yml
@@ -72,7 +72,8 @@ services:
   ## Nextcloud ##
   nc-app:
     container_name: nc-app
-    image: nextcloud:stable
+    build:
+      context: ./
     restart: always
     ports:
       - 8080:80
diff --git a/Config/Nextcloud/docker-compose.standard.yml b/Config/Nextcloud/docker-compose.standard.yml
index a1cdb6d..0343153 100644
--- a/Config/Nextcloud/docker-compose.standard.yml
+++ b/Config/Nextcloud/docker-compose.standard.yml
@@ -73,7 +73,8 @@ services:
   ## Nextcloud ##
   nc-app:
     container_name: nc-app
-    image: nextcloud:stable
+    build:
+      context: ./
     restart: always
     ports:
       - 8080:80
diff --git a/Config/Nextcloud/fixes.sh b/Config/Nextcloud/maintenance.sh
similarity index 75%
rename from Config/Nextcloud/fixes.sh
rename to Config/Nextcloud/maintenance.sh
index 270ab56..39cc526 100755
--- a/Config/Nextcloud/fixes.sh
+++ b/Config/Nextcloud/maintenance.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # 2022-09-25 Hyperling
-# Put fixes in a file so they do not need remembered.
+# Put maintenance needs into a file so the commands do not need remembered.
 
 ## Setup ##
 
@@ -11,19 +11,20 @@ source $DIR/../../source.env
 
 ## Main ##
 
-echo -e "\n*** APT ***"
-
-echo -e "\n`date` - Update Apt Cache"
-docker exec -it nc-app apt update -y
-
-echo -e "\n`date` - Install Additional Software"
-docker exec -it nc-app apt install -y sudo libmagickcore-6.q16-6-extra htop \
-	iputils-ping dnsutils vim bzip2 libbz2-dev # php-bz2
-
-# 20240130
-# https://help.nextcloud.com/t/docker-image-setup-warning-missing-bz2-after-update-to-nc-28-0-0/176605
-echo -e "\n`date` - Compile PHP Modules"
-docker exec -it nc-app docker-php-ext-install bz2
+##### 20250616 - Apt and PHP commands now baked into the Dockerfile!! :D #####
+###echo -e "\n*** APT ***"
+###
+###echo -e "\n`date` - Update Apt Cache"
+###docker exec -it nc-app apt update -y
+###
+###echo -e "\n`date` - Install Additional Software"
+###docker exec -it nc-app apt install -y sudo libmagickcore-6.q16-6-extra htop \
+###	iputils-ping dnsutils vim bzip2 libbz2-dev # php-bz2
+###
+#### 20240130
+#### https://help.nextcloud.com/t/docker-image-setup-warning-missing-bz2-after-update-to-nc-28-0-0/176605
+###echo -e "\n`date` - Compile PHP Modules"
+###docker exec -it nc-app docker-php-ext-install bz2
 
 # 2023-12-04 Make sure cron and chmod commands get run.
 echo -e "\n*** CRON ***"