From b5f7e599e0d2a5569d9ce4627cec5243827936f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?louiz=E2=80=99?= <louiz@louiz.org>
Date: Tue, 17 Sep 2019 17:20:46 +0200
Subject: Update the images and .spec to use sphinx instead of pandoc
---
docker/biboumi-test/alpine/Dockerfile | 1 +
docker/biboumi-test/debian/Dockerfile | 8 ++++----
docker/biboumi-test/fedora/Dockerfile | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
(limited to 'docker')
diff --git a/docker/biboumi-test/alpine/Dockerfile b/docker/biboumi-test/alpine/Dockerfile
index e43f1b6..6ba0a3e 100644
--- a/docker/biboumi-test/alpine/Dockerfile
+++ b/docker/biboumi-test/alpine/Dockerfile
@@ -26,6 +26,7 @@ RUN apk add --no-cache g++\
python3-dev\
automake\
autoconf\
+ libffi-dev\
flex\
bison\
libltdl\
diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile
index 557face..1c6437c 100644
--- a/docker/biboumi-test/debian/Dockerfile
+++ b/docker/biboumi-test/debian/Dockerfile
@@ -1,7 +1,7 @@
# This Dockerfile creates a docker image suitable to run biboumi’s build and
# tests. For example, it can be used on with gitlab-ci.
-FROM docker.io/debian:latest
+FROM docker.io/debian:buster
ENV LC_ALL C.UTF-8
@@ -22,8 +22,8 @@ RUN apt install -y g++\
libidn11-dev\
uuid-dev\
libsystemd-dev\
- pandoc\
- libasan3\
+ python3-sphinx\
+ libasan5\
libubsan0\
git\
python3-lxml\
@@ -46,7 +46,7 @@ RUN apt install -y g++\
RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && rm -rf /botan
# Install slixmpp, for e2e tests
-RUN git clone https://github.com/saghul/aiodns.git && cd aiodns && git checkout 7ee13f9bea25784322~ && python3 setup.py build && python3 setup.py install && git clone git://git.louiz.org/slixmpp && pip3 install pyasn1==0.4.2 && cd slixmpp && python3 setup.py build && python3 setup.py install
+RUN git clone https://github.com/saghul/aiodns.git && cd aiodns && git checkout 7ee13f9bea25784322~ && python3 setup.py build && python3 setup.py install && git clone git://git.louiz.org/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
RUN useradd tester -m
diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile
index cb0be8c..61fa3be 100644
--- a/docker/biboumi-test/fedora/Dockerfile
+++ b/docker/biboumi-test/fedora/Dockerfile
@@ -20,7 +20,7 @@ RUN dnf --refresh install -y\
libidn-devel\
uuid-devel\
systemd-devel\
- pandoc\
+ python3-sphinx\
libasan\
libubsan\
git\
--
cgit v1.2.3