Skip to content

Commit 2161de3

Browse files
author
Hugo Osvaldo Barrera
committed
Avoid docker-compose
The way it handles docker networks breaks builds.
1 parent ef34d77 commit 2161de3

File tree

7 files changed

+14
-27
lines changed

7 files changed

+14
-27
lines changed

MANIFEST.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# setuptools-scm includes everything tracked by git
22
prune docker
3-
prune docker-compose
43
prune scripts
54
prune tests/storage/servers
65
prune tests/storage/etesync

docker-compose.yaml

Lines changed: 0 additions & 17 deletions
This file was deleted.

docs/contributing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ initialized and documented.
102102

103103
For example, to test xandikos, first run the server itself::
104104

105-
docker-compose build xandikos
106-
docker-compose up -d xandikos
105+
docker build -t xandikos docker/xandikos
106+
docker start -p 8000:8000 xandikos
107107

108108
Then run the tests specifying this ``DAV_SERVER``, run::
109109

scripts/tests.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
image: archlinux
44
packages:
55
- docker
6-
- docker-compose
76
- python-pip
87
sources:
98
- https://github.com/pimutils/vdirsyncer
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/sh
22

3-
docker-compose build baikal
4-
docker-compose up -d baikal
3+
cd $(git rev-parse --show-toplevel)
4+
5+
docker build -t baikal docker/baikal
6+
docker run -d -p 8002:80 baikal
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/sh
22

3-
docker-compose build radicale
4-
docker-compose up -d radicale
3+
cd $(git rev-parse --show-toplevel)
4+
5+
docker build -t radicale docker/radicale
6+
docker run -d -p 8001:8001 radicale
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/sh
22

3-
docker-compose build xandikos
4-
docker-compose up -d xandikos
3+
cd $(git rev-parse --show-toplevel)
4+
5+
docker build -t xandikos docker/xandikos
6+
docker run -d -p 8000:8000 xandikos

0 commit comments

Comments
 (0)