From 00de7e0de01263c39df6963e78eae1f3cdae260f Mon Sep 17 00:00:00 2001 From: Goffi Date: Thu, 14 Dec 2023 09:19:32 +0100 Subject: [PATCH] docker (demo): create file-sharing and demo account in init script --- docker/backend-dev-demo/Dockerfile | 10 ---------- docker/backend-dev-demo/scripts/init_script.sh | 8 ++++++++ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/docker/backend-dev-demo/Dockerfile b/docker/backend-dev-demo/Dockerfile index 6b43ed5c..f3a71950 100644 --- a/docker/backend-dev-demo/Dockerfile +++ b/docker/backend-dev-demo/Dockerfile @@ -14,16 +14,6 @@ COPY --chown=root:root libervia.conf /etc/libervia.conf USER libervia -RUN ./entrypoint.sh \ - # we create the file sharing component which will autoconnect when backend is started - libervia-cli profile create file-sharing -j files.server1.test -p "" --xmpp-password test_e2e -C file-sharing -A && \ - libervia-backend stop - -RUN ./entrypoint.sh \ - # and a demo account - libervia-cli profile create demo -j demo@server1.test -p "demo" && \ - libervia-backend stop - COPY --chown=libervia:libervia forums.json /home/libervia/ COPY --chown=libervia:libervia scripts/init_script.sh /home/libervia/ diff --git a/docker/backend-dev-demo/scripts/init_script.sh b/docker/backend-dev-demo/scripts/init_script.sh index 79db20a1..e3729266 100755 --- a/docker/backend-dev-demo/scripts/init_script.sh +++ b/docker/backend-dev-demo/scripts/init_script.sh @@ -6,6 +6,14 @@ FORUMS_JSON_FILE="/home/libervia/forums.json" if [ ! -f "$SETUP_INDICATOR" ]; then echo "First run detected. Setting up the environment and configuration." + # we create the file sharing component which will autoconnect when backend is started + libervia-cli profile create file-sharing -j files.server1.test -p "" --xmpp-password test_e2e -C file-sharing -A + # we have to be sure that file-sharing is connected before demo account, + # otherwise disco will be cached without it, and feature such as file + # sharing won't be available. + libervia-cli profile connect -cp file-sharing + # create a demo account + libervia-cli profile create demo -j demo@server1.test -p "demo" libervia-cli profile modify -D -cp demo --pwd demo libervia-cli forums set -p demo < $FORUMS_JSON_FILE libervia-cli bookmarks add -pdemo -a demo@chat.server1.test