revert to stable apache instead of custom image

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
This commit is contained in:
ahuston-0 2024-08-16 00:08:32 -04:00
parent 7be48fca2a
commit 6aa2d208df
No known key found for this signature in database
GPG Key ID: 1FACF4075E3212F7

View File

@ -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";