diff --git a/modules/server/containers/apps/etherpad.nix b/modules/server/containers/apps/etherpad.nix index 07040a0..6193305 100644 --- a/modules/server/containers/apps/etherpad.nix +++ b/modules/server/containers/apps/etherpad.nix @@ -2,7 +2,7 @@ let serverCfg = config.syscfg.server; etherpad_exe = pkgs.etherpad-lite; - settings = pkgs.writeTextDir"etc/etherpad/settings.json" (builtins.toJSON { + settings = pkgs.writeText"settings.json" (builtins.toJSON { title= "\${TITLE:Etherpad}"; showRecentPads = "\${SHOW_RECENT_PADS:true}"; favicon = "\${FAVICON:null}"; @@ -69,18 +69,12 @@ let image = pkgs.dockerTools.streamLayeredImage { name = "etherpad"; tag = etherpad_exe.version; - contents = with pkgs;[cacert tzdata bash coreutils curl settings ]; - fakeRootCommands = '' - mkdir -p ./opt ./tmp - chmod 1777 ./opt ./tmp - ''; + config = { - Cmd = [ "${etherpad_exe}/bin/etherpad-lite" "--settings=/etc/etherpad/settings.json" "--apikey=\"$APIKEY\""]; - User = "1000:1000"; + Entrypoint = [ "${etherpad_exe}/bin/etherpad-lite" ]; ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; }; Env = [ "NODE_ENV=production" - "HOME=./opt" ]; }; @@ -109,7 +103,12 @@ in { PAD_OPTIONS_USE_MONOSPACE_FONT = "true"; SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background"; }; - overrides = { }; + overrides = { + command = [ "--settings" "/etc/etherpad/settings.json" "--apikey=\"$APIKEY\""]; + volumes = [ + "${settings}:/etc/etherpad/settings.json" + ]; + }; }; };