mirror of
https://github.com/samsonjs/vdirsyncer.git
synced 2026-04-27 14:57:41 +00:00
Avoid docker-compose
The way it handles docker networks breaks builds.
This commit is contained in:
parent
ef34d77ab1
commit
2161de30d0
7 changed files with 14 additions and 27 deletions
|
|
@ -1,6 +1,5 @@
|
||||||
# setuptools-scm includes everything tracked by git
|
# setuptools-scm includes everything tracked by git
|
||||||
prune docker
|
prune docker
|
||||||
prune docker-compose
|
|
||||||
prune scripts
|
prune scripts
|
||||||
prune tests/storage/servers
|
prune tests/storage/servers
|
||||||
prune tests/storage/etesync
|
prune tests/storage/etesync
|
||||||
|
|
|
||||||
|
|
@ -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'
|
|
||||||
|
|
@ -102,8 +102,8 @@ initialized and documented.
|
||||||
|
|
||||||
For example, to test xandikos, first run the server itself::
|
For example, to test xandikos, first run the server itself::
|
||||||
|
|
||||||
docker-compose build xandikos
|
docker build -t xandikos docker/xandikos
|
||||||
docker-compose up -d xandikos
|
docker start -p 8000:8000 xandikos
|
||||||
|
|
||||||
Then run the tests specifying this ``DAV_SERVER``, run::
|
Then run the tests specifying this ``DAV_SERVER``, run::
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
image: archlinux
|
image: archlinux
|
||||||
packages:
|
packages:
|
||||||
- docker
|
- docker
|
||||||
- docker-compose
|
|
||||||
- python-pip
|
- python-pip
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/pimutils/vdirsyncer
|
- https://github.com/pimutils/vdirsyncer
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
docker-compose build baikal
|
cd $(git rev-parse --show-toplevel)
|
||||||
docker-compose up -d baikal
|
|
||||||
|
docker build -t baikal docker/baikal
|
||||||
|
docker run -d -p 8002:80 baikal
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
docker-compose build radicale
|
cd $(git rev-parse --show-toplevel)
|
||||||
docker-compose up -d radicale
|
|
||||||
|
docker build -t radicale docker/radicale
|
||||||
|
docker run -d -p 8001:8001 radicale
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,6 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
docker-compose build xandikos
|
cd $(git rev-parse --show-toplevel)
|
||||||
docker-compose up -d xandikos
|
|
||||||
|
docker build -t xandikos docker/xandikos
|
||||||
|
docker run -d -p 8000:8000 xandikos
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue