Fix
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
let
|
let
|
||||||
serverCfg = config.syscfg.server;
|
serverCfg = config.syscfg.server;
|
||||||
etherpad_exe = pkgs.etherpad-lite;
|
etherpad_exe = pkgs.etherpad-lite;
|
||||||
settings = pkgs.writeTextDir"etc/etherpad/settings.json" (builtins.toJSON {
|
settings = pkgs.writeText"settings.json" (builtins.toJSON {
|
||||||
title= "\${TITLE:Etherpad}";
|
title= "\${TITLE:Etherpad}";
|
||||||
showRecentPads = "\${SHOW_RECENT_PADS:true}";
|
showRecentPads = "\${SHOW_RECENT_PADS:true}";
|
||||||
favicon = "\${FAVICON:null}";
|
favicon = "\${FAVICON:null}";
|
||||||
@@ -69,18 +69,12 @@ let
|
|||||||
image = pkgs.dockerTools.streamLayeredImage {
|
image = pkgs.dockerTools.streamLayeredImage {
|
||||||
name = "etherpad";
|
name = "etherpad";
|
||||||
tag = etherpad_exe.version;
|
tag = etherpad_exe.version;
|
||||||
contents = with pkgs;[cacert tzdata bash coreutils curl settings ];
|
|
||||||
fakeRootCommands = ''
|
|
||||||
mkdir -p ./opt ./tmp
|
|
||||||
chmod 1777 ./opt ./tmp
|
|
||||||
'';
|
|
||||||
config = {
|
config = {
|
||||||
Cmd = [ "${etherpad_exe}/bin/etherpad-lite" "--settings=/etc/etherpad/settings.json" "--apikey=\"$APIKEY\""];
|
Entrypoint = [ "${etherpad_exe}/bin/etherpad-lite" ];
|
||||||
User = "1000:1000";
|
|
||||||
ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; };
|
ExposedPorts = { "${toString containerCfg.port}/tcp" = {}; };
|
||||||
Env = [
|
Env = [
|
||||||
"NODE_ENV=production"
|
"NODE_ENV=production"
|
||||||
"HOME=./opt"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
};
|
};
|
||||||
@@ -109,7 +103,12 @@ in {
|
|||||||
PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
|
PAD_OPTIONS_USE_MONOSPACE_FONT = "true";
|
||||||
SKIN_VARIANTS = "super-dark-toolbar light-editor dark-background";
|
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"
|
||||||
|
];
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user