From 8c4e2489333183125760b827c18d382ad8cebff4 Mon Sep 17 00:00:00 2001 From: Kalmalyzer Date: Tue, 7 Mar 2017 13:57:01 +0100 Subject: [PATCH] Create default client configuration for "root" user The "clconfigureclient" command should ideally have been used to do this instead of providing a pre-made client.conf file, but the command does not support specifying username/password on the command line --- plastic/Dockerfile | 2 ++ plastic/client.conf | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 plastic/client.conf diff --git a/plastic/Dockerfile b/plastic/Dockerfile index 8095ecd..d4433e5 100644 --- a/plastic/Dockerfile +++ b/plastic/Dockerfile @@ -24,6 +24,7 @@ RUN { \ ln -s /conf/users.conf /opt/plasticscm5/server && ln -s /conf/groups.conf /opt/plasticscm5/server; \ ln -s /conf/plasticd.lic /opt/plasticscm5/server; \ ln -s /conf/plasticd.token.lic /opt/plasticscm5/server; \ + ln -s /conf/client.conf /opt/plasticscm5/client/client.conf; \ } RUN umtool cu root root @@ -32,6 +33,7 @@ RUN umtool autg root administrators ADD loader.log.conf /opt/plasticscm5/server/ ADD db.conf /opt/plasticscm5/server/ +ADD client.conf /conf EXPOSE 8087 diff --git a/plastic/client.conf b/plastic/client.conf new file mode 100644 index 0000000..5afed73 --- /dev/null +++ b/plastic/client.conf @@ -0,0 +1,36 @@ + + + en + localhost:8087 + UPWorkingMode + root:umPo5U0yaxGGpa4PnRXkOg== + + + enTextFile + * + + gtkmergetool -b="@basefile" -bn="@basesymbolic" -bh="@basehash" -s="@sourcefile" -sn="@sourcesymbolic" -sh="@sourcehash" -d="@destinationfile" -dh="@destinationhash" -a -r="@output" -t="@filetype" -i="@comparationmethod" -e="@fileencoding" -m="@mergetype" -re="@resultencoding" --progress="@progress" --extrainfofile="@extrainfofile" + + + + + + enTextFile + * + + gtkmergetool -s="@sourcefile" -sn="@sourcesymbolic" -d="@destinationfile" -dn="@destinationsymbolic" -t="@filetype" -i="@comparationmethod" -e="@fileencoding" + + + + no + no + no + no + no + no + no + 50 + 1 + 1 + team_or_enterprise + \ No newline at end of file