mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the images and .spec to use sphinx instead of pandoc

Browse Source
This commit is contained in:
louiz’
2019-09-17 17:20:46 +02:00
parent 2f0078ebfc
commit b5f7e599e0
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/biboumi-test/alpine/Dockerfile
+1
View File
@@ -26,6 +26,7 @@ RUN apk add --no-cache g++\
python3-dev\ python3-dev\
automake\ automake\
autoconf\ autoconf\
libffi-dev\
flex\ flex\
bison\ bison\
libltdl\ libltdl\
docker/biboumi-test/debian/Dockerfile
+4 -4
View File
@@ -1,7 +1,7 @@
# This Dockerfile creates a docker image suitable to run biboumi’s build and # This Dockerfile creates a docker image suitable to run biboumi’s build and
# tests. For example, it can be used on with gitlab-ci. # 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 ENV LC_ALL C.UTF-8
@@ -22,8 +22,8 @@ RUN apt install -y g++\
libidn11-dev\ libidn11-dev\
uuid-dev\ uuid-dev\
libsystemd-dev\ libsystemd-dev\
pandoc\ python3-sphinx\
libasan3\ libasan5\
libubsan0\ libubsan0\
git\ git\
python3-lxml\ 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 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 # 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 RUN useradd tester -m
docker/biboumi-test/fedora/Dockerfile
+1 -1
View File
@@ -20,7 +20,7 @@ RUN dnf --refresh install -y\
libidn-devel\ libidn-devel\
uuid-devel\ uuid-devel\
systemd-devel\ systemd-devel\
pandoc\ python3-sphinx\
libasan\ libasan\
libubsan\ libubsan\
git\ git\
packaging/biboumi.spec.cmake
+2 -1
View File
@@ -16,7 +16,7 @@ BuildRequires: postgresql-devel
BuildRequires: botan2-devel BuildRequires: botan2-devel
BuildRequires: cmake BuildRequires: cmake
BuildRequires: systemd BuildRequires: systemd
BuildRequires: pandoc BuildRequires: python3-sphinx
%global _hardened_build 1 %global _hardened_build 1
@@ -67,6 +67,7 @@ make check %{?_smp_mflags}
* ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1 * ${RPM_DATE} Le Coz Florent <louiz@louiz.org> - ${RPM_VERSION}-1
- Build latest git revision - Build latest git revision
- Build against botan2 - Build against botan2
- Build with sphinx instead of pandoc
* Fri Jun 1 2018 Le Coz Florent <louiz@louiz.org> - 8.3-1 * Fri Jun 1 2018 Le Coz Florent <louiz@louiz.org> - 8.3-1
Update to version 8.3 Update to version 8.3