annotate docker/docker-compose-e2e.yml @ 3652:6e34307319c0

plugin XEP-0353: fix jingle initiation on disco "Service Unavailable" error: When requesting disco info on a bare jid which is not in our roster, server may return "Service Unavailable" (to avoid leaking valid JIDs). In this case, the initiation was failing, this is now fixed by using empty categories in this case.
author Goffi <goffi@goffi.org>
date Wed, 08 Sep 2021 11:16:52 +0200
parents 0ffaa231138c
children bb19703af326
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3381
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
1 version: "3.6"
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
2 services:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
3
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
4 prosody:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
5 image: libervia/prosody:e2e
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
6 build: prosody-e2e
3381
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
7 depends_on:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
8 # we need to depend on backend to get IP address of the container for conf
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
9 - backend
3381
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
10 tmpfs: /var/lib/prosody
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
11 tmpfs: /var/log/prosody
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
12 networks:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
13 default:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
14 aliases:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
15 - server1.test
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
16 - server2.test
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
17 - server3.test
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
18
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
19 db:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
20 image: postgres
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
21 environment:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
22 POSTGRES_PASSWORD: test_e2e
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
23 POSTGRES_DB: pubsub
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
24 tmpfs: /var/lib/postgresql/data
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
25
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
26 pubsub:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
27 build: pubsub
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
28 image: libervia/pubsub
3381
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
29 depends_on:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
30 - db
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
31 - prosody
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
32 environment:
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
33 PGHOST: db
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
34 PGUSER: postgres
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
35 PGPASSWORD: test_e2e
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
36 LIBERVIA_PUBSUB_RHOST: server1.test
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
37 LIBERVIA_PUBSUB_JID: pubsub.server1.test
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
38 LIBERVIA_PUBSUB_XMPP_PWD: test_e2e
3381
127dde80a0a5 docker: dockers images, first draft:
Goffi <goffi@goffi.org>
parents:
diff changeset
39
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
40 backend:
3641
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
41 image: libervia/backend:${DOCKER_LIBERVIA_REV:-dev}-e2e
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
42 build:
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
43 context: backend-dev-e2e
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
44 args:
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
45 REVISION: ${DOCKER_LIBERVIA_REV:-}
3387
b3e7e3c49d8f docker (compose): test environment variable + network alias:
Goffi <goffi@goffi.org>
parents: 3381
diff changeset
46 environment:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
47 LIBERVIA_TEST_ENV_E2E: "1"
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
48 LIBERVIA_TEST_ENV_E2E_WEB: "1"
3432
d9955bb10d15 docker (e2e): use shared volume for SàT's local dir:
Goffi <goffi@goffi.org>
parents: 3429
diff changeset
49 volumes:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
50 - libervia_data:/home/libervia/.local/share/libervia
3429
d4558f3cbf13 tests, docker(e2e): added e2e tests for Libervia:
Goffi <goffi@goffi.org>
parents: 3423
diff changeset
51 ports:
d4558f3cbf13 tests, docker(e2e): added e2e tests for Libervia:
Goffi <goffi@goffi.org>
parents: 3423
diff changeset
52 # VNC server for Libervia e2e tests visual mode
d4558f3cbf13 tests, docker(e2e): added e2e tests for Libervia:
Goffi <goffi@goffi.org>
parents: 3423
diff changeset
53 - 5900
3387
b3e7e3c49d8f docker (compose): test environment variable + network alias:
Goffi <goffi@goffi.org>
parents: 3381
diff changeset
54 networks:
b3e7e3c49d8f docker (compose): test environment variable + network alias:
Goffi <goffi@goffi.org>
parents: 3381
diff changeset
55 default:
b3e7e3c49d8f docker (compose): test environment variable + network alias:
Goffi <goffi@goffi.org>
parents: 3381
diff changeset
56 aliases:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
57 - libervia-backend.test
3423
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
58
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
59 web:
3641
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
60 image: libervia/web:${DOCKER_LIBERVIA_REV:-dev}-e2e
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
61 build:
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
62 context: libervia-web-dev-e2e
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
63 args:
0ffaa231138c docker: Libervia revision can now be specified:
Goffi <goffi@goffi.org>
parents: 3497
diff changeset
64 REVISION: ${DOCKER_LIBERVIA_REV:-}
3423
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
65 depends_on:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
66 - backend
3423
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
67 environment:
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
68 LIBERVIA_PASSPHRASE: test_e2e
3432
d9955bb10d15 docker (e2e): use shared volume for SàT's local dir:
Goffi <goffi@goffi.org>
parents: 3429
diff changeset
69 volumes:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
70 - libervia_data:/home/libervia/.local/share/libervia
3423
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
71 ports:
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
72 - "8080"
0653be94ee5e docker: added libervia e2e image and include it in `docker-compose_e2e`:
Goffi <goffi@goffi.org>
parents: 3387
diff changeset
73 - "8443"
3429
d4558f3cbf13 tests, docker(e2e): added e2e tests for Libervia:
Goffi <goffi@goffi.org>
parents: 3423
diff changeset
74 networks:
d4558f3cbf13 tests, docker(e2e): added e2e tests for Libervia:
Goffi <goffi@goffi.org>
parents: 3423
diff changeset
75 default:
d4558f3cbf13 tests, docker(e2e): added e2e tests for Libervia:
Goffi <goffi@goffi.org>
parents: 3423
diff changeset
76 aliases:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
77 - libervia-web.test
3432
d9955bb10d15 docker (e2e): use shared volume for SàT's local dir:
Goffi <goffi@goffi.org>
parents: 3429
diff changeset
78
d9955bb10d15 docker (e2e): use shared volume for SàT's local dir:
Goffi <goffi@goffi.org>
parents: 3429
diff changeset
79 volumes:
3497
73e04040d577 docker: update following name changes:
Goffi <goffi@goffi.org>
parents: 3432
diff changeset
80 libervia_data: