Avoid docker-compose

The way it handles docker networks breaks builds.
This commit is contained in:
Hugo Osvaldo Barrera 2021-04-05 21:55:45 +02:00
parent ef34d77ab1
commit 2161de30d0
7 changed files with 14 additions and 27 deletions

View file

@ -1,6 +1,5 @@
# setuptools-scm includes everything tracked by git
prune docker
prune docker-compose
prune scripts
prune tests/storage/servers
prune tests/storage/etesync

View file

@ -1,17 +0,0 @@
version: '3'
services:
xandikos:
build: docker/xandikos/
ports:
- '8000:8000'
radicale:
build: docker/radicale/
ports:
- '8001:8001'
baikal:
build: docker/baikal/
ports:
- '8002:80'

View file

@ -102,8 +102,8 @@ initialized and documented.
For example, to test xandikos, first run the server itself::
docker-compose build xandikos
docker-compose up -d xandikos
docker build -t xandikos docker/xandikos
docker start -p 8000:8000 xandikos
Then run the tests specifying this ``DAV_SERVER``, run::

View file

@ -3,7 +3,6 @@
image: archlinux
packages:
- docker
- docker-compose
- python-pip
sources:
- https://github.com/pimutils/vdirsyncer

View file

@ -1,4 +1,6 @@
#!/bin/sh
docker-compose build baikal
docker-compose up -d baikal
cd $(git rev-parse --show-toplevel)
docker build -t baikal docker/baikal
docker run -d -p 8002:80 baikal

View file

@ -1,4 +1,6 @@
#!/bin/sh
docker-compose build radicale
docker-compose up -d radicale
cd $(git rev-parse --show-toplevel)
docker build -t radicale docker/radicale
docker run -d -p 8001:8001 radicale

View file

@ -1,4 +1,6 @@
#!/bin/sh
docker-compose build xandikos
docker-compose up -d xandikos
cd $(git rev-parse --show-toplevel)
docker build -t xandikos docker/xandikos
docker run -d -p 8000:8000 xandikos