From d747977af2467e0a956e3b18571d941b78977f5d Mon Sep 17 00:00:00 2001
From: Hugo Osvaldo Barrera <hugo@barrera.io>
Date: Sat, 12 Jun 2021 10:54:56 +0200
Subject: [PATCH] Use externally-built containers for test servers

This speeds up CI by avoiding a rebuild of these container on each run.
---
 docker/radicale/Dockerfile                |  5 -----
 docker/xandikos/Dockerfile                | 13 -------------
 tests/storage/servers/radicale/install.sh |  5 +----
 tests/storage/servers/xandikos/install.sh |  5 +----
 4 files changed, 2 insertions(+), 26 deletions(-)
 delete mode 100644 docker/radicale/Dockerfile
 delete mode 100644 docker/xandikos/Dockerfile

diff --git a/docker/radicale/Dockerfile b/docker/radicale/Dockerfile
deleted file mode 100644
index 462c5e2..0000000
--- a/docker/radicale/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM python:3.8
-
-RUN pip install radicale
-
-CMD radicale --storage-filesystem-folder /tmp/dav -H 0.0.0.0:8001 -D
diff --git a/docker/xandikos/Dockerfile b/docker/xandikos/Dockerfile
deleted file mode 100644
index 464450c..0000000
--- a/docker/xandikos/Dockerfile
+++ /dev/null
@@ -1,13 +0,0 @@
-# Original file copyright 2017 Jelmer Vernooij
-
-FROM ubuntu:bionic
-RUN apt-get update && apt-get -y install xandikos locales
-EXPOSE 8000
-
-RUN locale-gen en_US.UTF-8
-ENV PYTHONIOENCODING=utf-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-CMD xandikos -d /tmp/dav -l 0.0.0.0 -p 8000 --autocreate
diff --git a/tests/storage/servers/radicale/install.sh b/tests/storage/servers/radicale/install.sh
index 690c9f3..fdeaff9 100644
--- a/tests/storage/servers/radicale/install.sh
+++ b/tests/storage/servers/radicale/install.sh
@@ -1,6 +1,3 @@
 #!/bin/sh
 
-cd $(git rev-parse --show-toplevel)
-
-docker build -t radicale docker/radicale
-docker run -d -p 8001:8001 radicale
+docker run -d -p 8001:8001 whynothugo/vdirsyncer-devkit-radicale
diff --git a/tests/storage/servers/xandikos/install.sh b/tests/storage/servers/xandikos/install.sh
index ff322b9..aa7b089 100644
--- a/tests/storage/servers/xandikos/install.sh
+++ b/tests/storage/servers/xandikos/install.sh
@@ -1,6 +1,3 @@
 #!/bin/sh
 
-cd $(git rev-parse --show-toplevel)
-
-docker build -t xandikos docker/xandikos
-docker run -d -p 8000:8000 xandikos
+docker run -d -p 8000:8000 whynothugo/vdirsyncer-devkit-xandikos