From 6aa2d208dfa98dab1febab3999f698bf1489562a Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Fri, 16 Aug 2024 00:08:32 -0400
Subject: [PATCH] revert to stable apache instead of custom image

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 systems/palatine-hill/docker/nextcloud.nix | 42 +++++++++++++---------
 1 file changed, 25 insertions(+), 17 deletions(-)

diff --git a/systems/palatine-hill/docker/nextcloud.nix b/systems/palatine-hill/docker/nextcloud.nix
index b5361ae..19fe4bf 100644
--- a/systems/palatine-hill/docker/nextcloud.nix
+++ b/systems/palatine-hill/docker/nextcloud.nix
@@ -6,28 +6,36 @@
 }:
 
 let
-  nextcloud-image = import ./nextcloud-image { inherit pkgs; };
+  # nextcloud-image = import ./nextcloud-image { inherit pkgs; };
+  nextcloud-base = {
+    image = "nextcloud:stable-apache";
+    hostname = "nextcloud";
+    volumes = [
+      "/ZFS/ZFS-primary/nextcloud/nc_data:/var/www/html:z"
+      "/ZFS/ZFS-primary/nextcloud/nc_php:/usr/local/etc/php"
+      "/ZFS/ZFS-primary/nextcloud/nc_prehooks:/docker-entrypoint-hooks.d/before-starting"
+    ];
+    extraOptions = [
+      "--restart=unless-stopped"
+      "--network=haproxy-net"
+      "--network=postgres-net"
+      "--network=nextcloud_default"
+    ];
+    dependsOn = [ "redis" ];
+    environmentFiles = [ config.sops.secrets."docker/nextcloud".path ];
+  };
 in
 {
   virtualisation.oci-containers.containers = {
-    nextcloud = {
-      image = "nextcloud-custom:latest";
-      imageFile = nextcloud-image;
-      hostname = "nextcloud";
+    nextcloud = nextcloud-base // {
       ports = [ "9999:80" ];
-      volumes = [
-        "/ZFS/ZFS-primary/nextcloud/nc_data:/var/www/html:z"
-        "/ZFS/ZFS-primary/nextcloud/nc_php:/usr/local/etc/php"
-        "/ZFS/ZFS-primary/nextcloud/nc_prehooks:/docker-entrypoint-hooks.d/before-starting"
+    };
+    nextcloud-cron = nextcloud-base // {
+      entrypoint = "/cron.sh";
+      dependsOn = [
+        "redis"
+        "nextcloud"
       ];
-      extraOptions = [
-        "--restart=unless-stopped"
-        "--network=haproxy-net"
-        "--network=postgres-net"
-        "--network=nextcloud_default"
-      ];
-      dependsOn = [ "redis" ];
-      environmentFiles = [ config.sops.secrets."docker/nextcloud".path ];
     };
     redis = {
       image = "redis:latest";