docker: update following name changes:
`backend_e2e` now print properly backend logs
This commit is contained in:
parent
19da80743b
commit
363788de7d
6 changed files with 295 additions and 288 deletions
22
docker/prosody-e2e/Dockerfile
Normal file
22
docker/prosody-e2e/Dockerfile
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
FROM prosody/prosody
|
||||
|
||||
LABEL maintainer="Goffi <tmp_dockerfiles@goffi.org>"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
# we synchronize tls-cert group with the one in libervia-web/libervia-backend
|
||||
RUN addgroup tls-cert --gid 9999 && adduser prosody tls-cert && \
|
||||
# we want third party modules
|
||||
apt-get update && apt-get install -y --no-install-recommends mercurial && \
|
||||
mkdir -p /usr/local/share/prosody && \
|
||||
hg clone https://hg.prosody.im/prosody-modules /usr/local/share/prosody/modules && \
|
||||
chown -R prosody:prosody /usr/local/share/prosody
|
||||
|
||||
COPY --chown=root:prosody prosody.cfg.lua /etc/prosody/prosody.cfg.lua
|
||||
COPY --chown=root:tls-cert certificates/server1.test/cert.pem /usr/share/libervia/certificates/server1.test.pem
|
||||
COPY --chown=root:tls-cert certificates/server1.test/key.pem /usr/share/libervia/certificates/server1.test-key.pem
|
||||
|
||||
# we add exec to handle properly signals, this is missing upstream
|
||||
# FIXME: to be removed when new images are generated with
|
||||
# https://github.com/prosody/prosody-docker/pull/65
|
||||
RUN sed -i "s/^runuser -u prosody/exec \0/" /entrypoint.sh
|
||||
2
docker/prosody-e2e/certificates/README
Normal file
2
docker/prosody-e2e/certificates/README
Normal file
|
|
@ -0,0 +1,2 @@
|
|||
this certificates are used to enable TLS during tests. Those must be the same as in
|
||||
backend_e2e (they are generated there)
|
||||
21
docker/prosody-e2e/certificates/server1.test/cert.pem
Normal file
21
docker/prosody-e2e/certificates/server1.test/cert.pem
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIDijCCAnKgAwIBAgIITwyWOI+1bQ8wDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE
|
||||
AxMVbWluaWNhIHJvb3QgY2EgNjFjNWEyMB4XDTIxMDQxNDE2MjA0NFoXDTIzMDUx
|
||||
NDE2MjA0NFowFzEVMBMGA1UEAxMMc2VydmVyMS50ZXN0MIIBIjANBgkqhkiG9w0B
|
||||
AQEFAAOCAQ8AMIIBCgKCAQEAtXAh2Mn5eIFLI5v1Zz8+BRsPKfjn1RBBs+ZVVysJ
|
||||
ez4DOOXcouWjOqcMPhWK/lN3NNm3SOWJQRJEZjHaU197YioX1cr1KP1pfAWlm03t
|
||||
MZpf/XoeoKpV+6svM2m6emNh6Y812ATin2DIigm2b4UrHiP8Seppd84dReGdpaD9
|
||||
7zCZBKv5fHCwcY+irjsV+1vRapLDvDMIL/6Vk8Fw3m9UlIhdZNudTKgxo8lYbhuo
|
||||
QsyhG0ydALgp+eeNKnZZdBCpdFOtZztbrS0DifQvkKxbv7+V3IAQ+4lLAfLoFNuV
|
||||
H5cukfuJbR9UjyqvBH16yCE2VNvL+dDZXYmh/q3yTF0MgQIDAQABo4HQMIHNMA4G
|
||||
A1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYD
|
||||
VR0TAQH/BAIwADAfBgNVHSMEGDAWgBRQfEdSX8zI0mvbVoU7AsYtFA5W8zBtBgNV
|
||||
HREEZjBkggxzZXJ2ZXIxLnRlc3SCDiouc2VydmVyMS50ZXN0ggxzZXJ2ZXIyLnRl
|
||||
c3SCDHNlcnZlcjMudGVzdIIVbGliZXJ2aWEtYmFja2VuZC50ZXN0ghFsaWJlcnZp
|
||||
YS13ZWIudGVzdDANBgkqhkiG9w0BAQsFAAOCAQEAetIuuZd7O0G8ssueqddVfedM
|
||||
syL4NZp/I6AWy9qiUcKf9lhGtLE3AblL5fhHanty94B4EyW5+8fjSrSSSRbUYkFH
|
||||
dbS41ptzuPGtU9S7OFp7C1TAZHeAgCdvJ4ZnD2YFNQXJ89bp+ZEi4Znu1avqckJP
|
||||
gMAd695gZaobZzehwAG00Xd9ELVku3Cnu4gsxMbgvcRFqq4Bplk/YYtDtd9FG2Qr
|
||||
mSBuUGwGikr9C4xEUw69uIq1SK98qaOBEwUgKYb/Rvh03OP5F2u36zdH8J3W/Mjv
|
||||
OGYo4RCLZFG0CntYLFTWOAoYRs7C7dlgwXRNgaNaRiseiPDka1DAaf6BQ8riMw==
|
||||
-----END CERTIFICATE-----
|
||||
27
docker/prosody-e2e/certificates/server1.test/key.pem
Normal file
27
docker/prosody-e2e/certificates/server1.test/key.pem
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEpAIBAAKCAQEAtXAh2Mn5eIFLI5v1Zz8+BRsPKfjn1RBBs+ZVVysJez4DOOXc
|
||||
ouWjOqcMPhWK/lN3NNm3SOWJQRJEZjHaU197YioX1cr1KP1pfAWlm03tMZpf/Xoe
|
||||
oKpV+6svM2m6emNh6Y812ATin2DIigm2b4UrHiP8Seppd84dReGdpaD97zCZBKv5
|
||||
fHCwcY+irjsV+1vRapLDvDMIL/6Vk8Fw3m9UlIhdZNudTKgxo8lYbhuoQsyhG0yd
|
||||
ALgp+eeNKnZZdBCpdFOtZztbrS0DifQvkKxbv7+V3IAQ+4lLAfLoFNuVH5cukfuJ
|
||||
bR9UjyqvBH16yCE2VNvL+dDZXYmh/q3yTF0MgQIDAQABAoIBAFCxZSxAb6Yrgpp8
|
||||
s0DO/KtSpITbQWgeCcqTxyK0bkwUgWRdvqnoDZd5UdWOyTlhL6QerAhMpaV+FVOK
|
||||
Gnp3/azj4aPg1vX69l4FOOkAWFx2NvjJxjNYblM2iBCKljf2WUaBvcWsLooJhkb2
|
||||
GOAyTsHh6UOKcIuq7JP2yqEuH6GvsD9z5B82d/uWtCMlf4PA26R6GGrEaJ4ARY0y
|
||||
ePthWmYOJdZi2CLf5RTfd3Y89EKkYbyj+/bmGTFrPThJwBcqjiTV+/Mu3rE7RG/i
|
||||
hkZWZi7Q319w/i83In0vHReSb/DOiwjYp+ChPjvKdv0DjL4RyfX5vSkZDDC+LKI8
|
||||
5fwEgy0CgYEA51LSAd2DGtYieeQc9jGiUtXzbxvTObGP01NcCX7iS04EF1czj/Ur
|
||||
Zrqwsc7yKkdJWaAn12JOolPOZtjEeU4Q3/Oyen9LdxsfPNzpHKqlcOJ/xVWZ/ikY
|
||||
WLn5nwpD8HLkx+WZj7TzbBqcs9UiKRkW7bUC3A7KDeBH/nMBDjWwJjcCgYEAyMr/
|
||||
AlpRf7OgYnOgEFYcHbNNzp2b7p5lK+8eDrEiRW+U3aT00f8+ZeqF6wSe0hn3gs94
|
||||
6IzRtrr0SBObi7My5t6duz56a6K3NE4JhI+3/P2YyQy/2lhYUkA7CG1YMJzvkVaM
|
||||
bSuY9bMptzVpjL6Sn3kyHoW/R9d9i3n0ipBDhwcCgYEA2bLy2ziJwv7VkVsh+nx5
|
||||
pHWf1Ogd4IT/s0UXMASOmYpBhWnWp9t2zgZSdfQpqapPGJ8F/8iP8mrmq5nDRdo3
|
||||
PVyOkoQsFFqdCl1osUbTzioLTz6hXzVzqUTU7Fzv1WF7d7jXzQvhrtJYuVGTBZSM
|
||||
JIeeulTcyTRS7N90ldfm//8CgYEAl1ia+jUFtRG51Dt+7JFbQ+/At/oIbMWrUIA9
|
||||
0akmQdwnAyGw/xA7AirRoiGrbIXyEAE+C1sJP4iPVDyjQ5tgxLALh/VB5RuSp7Qi
|
||||
bG6/qcuke/ZGLdflSqnrVSDGFm5UDOKFmkwAUUIoMVXrJxEGB3ockvERCp+cm6Li
|
||||
9gZjP8UCgYATWrDUb3+LOVHIVuYcrd9CDfO7OHT1yxmnef2hBYYs8MQ2ewVBTWkq
|
||||
jzTPuUCub6T72uVpefOciBByqbgUUUnXgfX8nTT2BEBGjoubf3/77RvsEnrEGEI/
|
||||
XncILicM1dwQXqR5fWDcpWRhehIzlzF70iZ3Ws1QC63gv4Z6VGifMQ==
|
||||
-----END RSA PRIVATE KEY-----
|
||||
15
docker/prosody-e2e/entrypoint.sh
Normal file
15
docker/prosody-e2e/entrypoint.sh
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
usermod -u "$(stat -c %u /var/lib/prosody/.)" prosody
|
||||
|
||||
if [[ "$1" != "prosody" ]]; then
|
||||
exec prosodyctl "$@"
|
||||
exit 0;
|
||||
fi
|
||||
|
||||
if [ "$LOCAL" -a "$PASSWORD" -a "$DOMAIN" ] ; then
|
||||
prosodyctl register "$LOCAL" "$DOMAIN" "$PASSWORD"
|
||||
fi
|
||||
|
||||
exec runuser -u prosody -- "$@"
|
||||
116
docker/prosody-e2e/prosody.cfg.lua
Normal file
116
docker/prosody-e2e/prosody.cfg.lua
Normal file
|
|
@ -0,0 +1,116 @@
|
|||
-- Prosody XMPP Server Configuration
|
||||
-- Adapted for SàT e2e tests
|
||||
|
||||
local socket = require "socket"
|
||||
|
||||
daemonize = false;
|
||||
admins = { }
|
||||
|
||||
plugin_paths = { "/usr/local/share/prosody/modules" }
|
||||
|
||||
modules_enabled = {
|
||||
"admin_adhoc";
|
||||
"blocklist";
|
||||
"carbons";
|
||||
"csi";
|
||||
"csi_simple";
|
||||
"delegation";
|
||||
"dialback";
|
||||
"disco";
|
||||
"mam";
|
||||
"pep";
|
||||
"ping";
|
||||
"private";
|
||||
"privilege";
|
||||
"register";
|
||||
"roster";
|
||||
"saslauth";
|
||||
"smacks";
|
||||
"time";
|
||||
"tls";
|
||||
"uptime";
|
||||
"vcard4";
|
||||
"vcard_legacy";
|
||||
"version";
|
||||
"ipcheck";
|
||||
}
|
||||
|
||||
modules_disabled = {
|
||||
}
|
||||
|
||||
allow_registration = true
|
||||
registration_whitelist = { socket.dns.toip("backend") }
|
||||
whitelist_registration_only = true
|
||||
|
||||
c2s_require_encryption = true
|
||||
s2s_require_encryption = true
|
||||
s2s_secure_auth = false
|
||||
|
||||
pidfile = "/var/run/prosody/prosody.pid"
|
||||
|
||||
authentication = "internal_hashed"
|
||||
|
||||
archive_expires_after = "1d"
|
||||
|
||||
log = {
|
||||
{levels = {min = "info"}, to = "console"};
|
||||
}
|
||||
|
||||
certificates = "certs"
|
||||
|
||||
ssl = {
|
||||
key = "/usr/share/libervia/certificates/server1.test-key.pem";
|
||||
certificate = "/usr/share/libervia/certificates/server1.test.pem";
|
||||
}
|
||||
|
||||
component_interface = "*"
|
||||
|
||||
VirtualHost "server1.test"
|
||||
privileged_entities = {
|
||||
["pubsub.server1.test"] = {
|
||||
roster = "get";
|
||||
message = "outgoing";
|
||||
presence = "roster";
|
||||
},
|
||||
}
|
||||
|
||||
delegations = {
|
||||
["urn:xmpp:mam:2"] = {
|
||||
filtering = {"node"};
|
||||
jid = "pubsub.server1.test";
|
||||
},
|
||||
["http://jabber.org/protocol/pubsub"] = {
|
||||
jid = "pubsub.server1.test";
|
||||
},
|
||||
["http://jabber.org/protocol/pubsub#owner"] = {
|
||||
jid = "pubsub.server1.test";
|
||||
},
|
||||
["https://salut-a-toi/protocol/schema:0"] = {
|
||||
jid = "pubsub.server1.test";
|
||||
},
|
||||
["http://jabber.org/protocol/disco#items:*"] = {
|
||||
jid = "pubsub.server1.test";
|
||||
},
|
||||
["https://salut-a-toi.org/spec/pubsub_admin:0"] = {
|
||||
jid = "pubsub.server1.test";
|
||||
},
|
||||
}
|
||||
|
||||
VirtualHost "server2.test"
|
||||
|
||||
VirtualHost "server3.test"
|
||||
|
||||
-- Component "muc.server1.test" "muc"
|
||||
-- modules_enabled = {
|
||||
-- "muc_mam";
|
||||
-- "vcard";
|
||||
-- }
|
||||
|
||||
Component "pubsub.server1.test"
|
||||
component_secret = "test_e2e"
|
||||
modules_enabled = {"privilege", "delegation"}
|
||||
|
||||
Component "proxy.server1.test" "proxy65"
|
||||
|
||||
Component "files.server1.test"
|
||||
component_secret = "test_e2e"
|
||||
Loading…
Reference in a new issue