diff options
| author | louiz’ <louiz@louiz.org> | 2018-02-05 22:53:36 +0100 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2018-02-05 22:53:36 +0100 |
| commit | 56651cb5c29cc50ddf3c62c37167fa0b9389bfde (patch) | |
| tree | ca652963cafeb02b0c6c7504b1cfbc27abdafe0b /docker/biboumi-test | |
| parent | ad1e0f8d52189e18df2d5a39228e255798a9de70 (diff) | |
| parent | e0d1a0b44add408504e428d6ce4a8a2121ea7a00 (diff) | |
| download | biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.gz biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.bz2 biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.tar.xz biboumi-56651cb5c29cc50ddf3c62c37167fa0b9389bfde.zip | |
Merge branch 'master' into debian
Diffstat (limited to 'docker/biboumi-test')
| -rw-r--r-- | docker/biboumi-test/alpine/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/biboumi-test/archlinux/Dockerfile | 13 | ||||
| -rw-r--r-- | docker/biboumi-test/debian/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/biboumi-test/fedora/Dockerfile | 1 |
4 files changed, 6 insertions, 16 deletions
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/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 diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index 3a1c1a7..557face 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -39,13 +39,14 @@ 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 # 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 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 |