From 2161de30d0596143727244cfc9c862a343cdf3d2 Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Mon, 5 Apr 2021 21:55:45 +0200
Subject: [PATCH] Avoid docker-compose

The way it handles docker networks breaks builds.
---
 MANIFEST.in                               |  1 -
 docker-compose.yaml                       | 17 -----------------
 docs/contributing.rst                     |  4 ++--
 scripts/tests.template                    |  1 -
 tests/storage/servers/baikal/install.sh   |  6 ++++--
 tests/storage/servers/radicale/install.sh |  6 ++++--
 tests/storage/servers/xandikos/install.sh |  6 ++++--
 7 files changed, 14 insertions(+), 27 deletions(-)
 delete mode 100644 docker-compose.yaml

diff --git a/MANIFEST.in b/MANIFEST.in
index 37426d3..9260ca0 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -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
diff --git a/docker-compose.yaml b/docker-compose.yaml
deleted file mode 100644
index 17779bb..0000000
--- a/docker-compose.yaml
+++ /dev/null
@@ -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'
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 233ea71..92f7170 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -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::
 
diff --git a/scripts/tests.template b/scripts/tests.template
index 26285e5..71181be 100644
--- a/scripts/tests.template
+++ b/scripts/tests.template
@@ -3,7 +3,6 @@
 image: archlinux
 packages:
   - docker
-  - docker-compose
   - python-pip
 sources:
   - https://github.com/pimutils/vdirsyncer
diff --git a/tests/storage/servers/baikal/install.sh b/tests/storage/servers/baikal/install.sh
index 99fcef9..023fef4 100644
--- a/tests/storage/servers/baikal/install.sh
+++ b/tests/storage/servers/baikal/install.sh
@@ -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
diff --git a/tests/storage/servers/radicale/install.sh b/tests/storage/servers/radicale/install.sh
index 51732d8..690c9f3 100644
--- a/tests/storage/servers/radicale/install.sh
+++ b/tests/storage/servers/radicale/install.sh
@@ -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
diff --git a/tests/storage/servers/xandikos/install.sh b/tests/storage/servers/xandikos/install.sh
index b01f6ea..ff322b9 100644
--- a/tests/storage/servers/xandikos/install.sh
+++ b/tests/storage/servers/xandikos/install.sh
@@ -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