diff options
| author | louiz’ <louiz@louiz.org> | 2019-09-17 17:20:46 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2019-09-17 17:20:46 +0200 |
| commit | b5f7e599e0d2a5569d9ce4627cec5243827936f7 (patch) | |
| tree | af3790a3d83c566bbc57bfd491890f59893d6026 | |
| parent | 2f0078ebfc453d9f40ea317a718e805ccd92a476 (diff) | |
| download | biboumi-b5f7e599e0d2a5569d9ce4627cec5243827936f7.tar.gz biboumi-b5f7e599e0d2a5569d9ce4627cec5243827936f7.tar.bz2 biboumi-b5f7e599e0d2a5569d9ce4627cec5243827936f7.tar.xz biboumi-b5f7e599e0d2a5569d9ce4627cec5243827936f7.zip | |
Update the images and .spec to use sphinx instead of pandoc
| -rw-r--r-- | docker/biboumi-test/alpine/Dockerfile | 1 | ||||
| -rw-r--r-- | docker/biboumi-test/debian/Dockerfile | 8 | ||||
| -rw-r--r-- | docker/biboumi-test/fedora/Dockerfile | 2 | ||||
| -rw-r--r-- | packaging/biboumi.spec.cmake | 3 |
4 files changed, 8 insertions, 6 deletions
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\ diff --git a/packaging/biboumi.spec.cmake b/packaging/biboumi.spec.cmake index 6f4676d..08f92a3 100644 --- a/packaging/biboumi.spec.cmake +++ b/packaging/biboumi.spec.cmake @@ -16,7 +16,7 @@ BuildRequires: postgresql-devel BuildRequires: botan2-devel BuildRequires: cmake BuildRequires: systemd -BuildRequires: pandoc +BuildRequires: python3-sphinx %global _hardened_build 1 @@ -67,6 +67,7 @@ make check %{?_smp_mflags} * ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1 - Build latest git revision - Build against botan2 +- Build with sphinx instead of pandoc * Fri Jun 1 2018 Le Coz Florent <louiz@louiz.org> - 8.3-1 Update to version 8.3 |