From b1f850b6395610c738a8e58abcdf2abfca3edd4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 16 Dec 2017 16:18:59 +0100 Subject: Update the docker images to enable postgresql, and document them --- docker/biboumi-test/alpine/Dockerfile | 3 ++- docker/biboumi-test/debian/Dockerfile | 3 ++- docker/biboumi-test/fedora/Dockerfile | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'docker/biboumi-test') diff --git a/docker/biboumi-test/alpine/Dockerfile b/docker/biboumi-test/alpine/Dockerfile index f97c58c..e43f1b6 100644 --- a/docker/biboumi-test/alpine/Dockerfile +++ b/docker/biboumi-test/alpine/Dockerfile @@ -32,7 +32,8 @@ RUN apk add --no-cache g++\ openssl\ libressl-dev\ zlib-dev\ - curl + curl\ + postgresql-dev # Install botan RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && rm -rf /botan diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index 3a1c1a7..65c964e 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -39,7 +39,8 @@ RUN apt install -y g++\ openssl\ zlib1g-dev\ libssl-dev\ - curl + curl\ + libpq-dev # Install botan RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && rm -rf /botan diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 8ff418c..12e13e5 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -39,6 +39,7 @@ RUN dnf --refresh install -y\ openssl-devel\ which\ java-1.8.0-openjdk\ + postgresql-devel\ && dnf clean all # Install botan -- cgit v1.2.3 From 044a1a0c8c34fc463066a52528cd59db6d206c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sat, 16 Dec 2017 20:36:15 +0100 Subject: Use a specific (0.4.2) pyasn1 version in the debian Dockerfile --- docker/biboumi-test/debian/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/biboumi-test') diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index 65c964e..557face 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -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 && 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==0.4.2 && cd slixmpp && python3 setup.py build && python3 setup.py install RUN useradd tester -m -- cgit v1.2.3 From a209e77fc2c189c251fa90eebdce0f16ff4f6f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Fri, 26 Jan 2018 00:35:08 +0100 Subject: Rename a few CI things to a useful names --- docker/biboumi-test/archlinux/Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 docker/biboumi-test/archlinux/Dockerfile (limited to 'docker/biboumi-test') diff --git a/docker/biboumi-test/archlinux/Dockerfile b/docker/biboumi-test/archlinux/Dockerfile deleted file mode 100644 index 20f0343..0000000 --- a/docker/biboumi-test/archlinux/Dockerfile +++ /dev/null @@ -1,13 +0,0 @@ -FROM docker.io/base/archlinux:latest - -RUN pacman -Syuuuu --noconfirm - -RUN pacman -Syu --noconfirm cmake base-devel git clang-tools-extra - -RUN useradd -m -G wheel -s /bin/bash builder - -RUN sed -i '/^# %wheel ALL=(ALL) NOPASSWD: ALL/s/^# //' /etc/sudoers - -WORKDIR /home/builder - -USER builder -- cgit v1.2.3