docker (demo): fix starting + better UX:
- Use the new `wait_for_service` option to be sure that Prosody is launched. - Use the new `init_script_path` option to initiate forums and bookmark a demo room. - Activate MUC service. - Change log formats to make them more readable.
This commit is contained in:
parent
6fa46e20fd
commit
b12d7a48e1
6 changed files with 67 additions and 7 deletions
|
|
@ -22,10 +22,11 @@ RUN ./entrypoint.sh \
|
|||
RUN ./entrypoint.sh \
|
||||
# and a demo account
|
||||
libervia-cli profile create demo -j demo@server1.test -p "demo" && \
|
||||
# we create a bookmark to have something to test in chat
|
||||
libervia-cli bookmarks add -pdemo -a demo@server1.test\
|
||||
libervia-backend stop
|
||||
|
||||
COPY --chown=libervia:libervia forums.json /home/libervia/
|
||||
COPY --chown=libervia:libervia scripts/init_script.sh /home/libervia/
|
||||
|
||||
USER libervia
|
||||
# HTTP Upload
|
||||
EXPOSE 7777
|
||||
|
|
|
|||
38
docker/backend-dev-demo/forums.json
Normal file
38
docker/backend-dev-demo/forums.json
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
[
|
||||
{
|
||||
"main-language": "en",
|
||||
"name": "Libervia",
|
||||
"title": "Libervia",
|
||||
"short-desc": "Forums about Libervia demo",
|
||||
"sub-forums": [
|
||||
{
|
||||
"uri": "",
|
||||
"title": "tools and features",
|
||||
"short-desc": "Discussions about Libervia frontends, tools, features, or changes"
|
||||
},
|
||||
{
|
||||
"uri": "",
|
||||
"title": "questions and help",
|
||||
"short-desc": "Mutual assistance for installation or using Libervia and its ecosystem"
|
||||
}
|
||||
],
|
||||
"desc": "Those are example forums."
|
||||
},
|
||||
{
|
||||
"main-language": "en",
|
||||
"title": "XMPP and associated",
|
||||
"sub-forums": [
|
||||
{
|
||||
"uri": "",
|
||||
"title": "XMPP software",
|
||||
"short-desc": "Topics about XMPP software other than Libervia"
|
||||
},
|
||||
{
|
||||
"uri": "",
|
||||
"title": "outside XMPP",
|
||||
"short-desc": "You can discuss or present here protocols or software similar to XMPP"
|
||||
}
|
||||
],
|
||||
"desc": "Forums about XMPP in general, or similar protocols"
|
||||
}
|
||||
]
|
||||
|
|
@ -1,4 +1,7 @@
|
|||
[DEFAULT]
|
||||
log_fmt = [%%(name)s] %%(message)s
|
||||
init_wait_for_service=prosody:5222::Prosody
|
||||
init_script_path=/home/libervia/init_script.sh
|
||||
xmpp_domain = server1.test
|
||||
email_server = libervia-backend.test
|
||||
email_port = 8025
|
||||
|
|
|
|||
17
docker/backend-dev-demo/scripts/init_script.sh
Executable file
17
docker/backend-dev-demo/scripts/init_script.sh
Executable file
|
|
@ -0,0 +1,17 @@
|
|||
#!/bin/bash
|
||||
|
||||
SETUP_INDICATOR="/home/libervia/.local/share/libervia/setup_complete.flag"
|
||||
FORUMS_JSON_FILE="/home/libervia/forums.json"
|
||||
|
||||
if [ ! -f "$SETUP_INDICATOR" ]; then
|
||||
echo "First run detected. Setting up the environment and configuration."
|
||||
|
||||
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
|
||||
|
||||
touch "$SETUP_INDICATOR"
|
||||
echo "Initial setup complete."
|
||||
else
|
||||
echo "Not the first run. Skipping setup."
|
||||
fi
|
||||
|
|
@ -1,2 +1,3 @@
|
|||
[DEFAULT]
|
||||
log_fmt = [%%(name)s] %%(message)s
|
||||
media_dir = /src/libervia-media
|
||||
|
|
|
|||
|
|
@ -109,11 +109,11 @@ VirtualHost "server2.test"
|
|||
|
||||
VirtualHost "server3.test"
|
||||
|
||||
-- Component "muc.server1.test" "muc"
|
||||
-- modules_enabled = {
|
||||
-- "muc_mam";
|
||||
-- "vcard";
|
||||
-- }
|
||||
Component "chat.server1.test" "muc"
|
||||
modules_enabled = {
|
||||
"muc_mam";
|
||||
"vcard";
|
||||
}
|
||||
|
||||
Component "pubsub.server1.test"
|
||||
component_secret = "test_e2e"
|
||||
|
|
|
|||
Loading…
Reference in a new issue