diff --git a/systems/palatine-hill/docker/nextcloud-image.nix b/systems/palatine-hill/docker/nextcloud-image.nix index d6c8a92..f48ca72 100644 --- a/systems/palatine-hill/docker/nextcloud-image.nix +++ b/systems/palatine-hill/docker/nextcloud-image.nix @@ -2,14 +2,14 @@ let nextcloud-apache = pkgs.dockerTools.pullImage { imageName = "nextcloud"; - digest = "sha256:2ab0c5de2afd33c55721e69e87bd1667cad6c4550ba0fd0303cfeb7abb260750"; - sha256sum = "11fh4jaz1asiihf2092sh7ma9xm35hmnkafpbjr3igkv8jicsky1"; + imageDigest = "sha256:2ab0c5de2afd33c55721e69e87bd1667cad6c4550ba0fd0303cfeb7abb260750"; + sha256 = "11fh4jaz1asiihf2092sh7ma9xm35hmnkafpbjr3igkv8jicsky1"; finalImageName = "nextcloud"; finalImageTag = "apache"; }; in -pkgs.dockerTools.buildLayeredImage { +pkgs.dockerTools.buildImage { name = "nextcloud-custom"; tag = "latest"; fromImage = nextcloud-apache; diff --git a/systems/palatine-hill/docker/nextcloud.nix b/systems/palatine-hill/docker/nextcloud.nix index bb62438..fc9f8da 100644 --- a/systems/palatine-hill/docker/nextcloud.nix +++ b/systems/palatine-hill/docker/nextcloud.nix @@ -6,7 +6,7 @@ }: let - nextcloud-image = import ./nextcloud-image.nix; + nextcloud-image = import ./nextcloud-image.nix { inherit pkgs; }; in { virtualisation.oci-containers.containers = { diff --git a/systems/palatine-hill/docker/supervisord.conf b/systems/palatine-hill/docker/supervisord.conf new file mode 100644 index 0000000..836a08a --- /dev/null +++ b/systems/palatine-hill/docker/supervisord.conf @@ -0,0 +1,22 @@ +[supervisord] +nodaemon=true +logfile=/var/log/supervisord/supervisord.log +pidfile=/var/run/supervisord/supervisord.pid +childlogdir=/var/log/supervisord/ +logfile_maxbytes=50MB ; maximum size of logfile before rotation +logfile_backups=10 ; number of backed up logfiles +loglevel=error + +[program:apache2] +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +command=apache2-foreground + +[program:cron] +stdout_logfile=/dev/stdout +stdout_logfile_maxbytes=0 +stderr_logfile=/dev/stderr +stderr_logfile_maxbytes=0 +command=/cron.sh