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

Update the docker images and the gitlab-ci script to use sqlite3

Browse Source
This commit is contained in:
louiz’
2017-06-14 00:19:15 +02:00
parent 369ccb0376
commit 41c23aab37
8 changed files with 163 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+7 -12
View File
@@ -22,7 +22,7 @@ variables:
UDNS: "-DWITH_UDNS=1" UDNS: "-DWITH_UDNS=1"
SYSTEMD: "-DWITH_SYSTEMD=1" SYSTEMD: "-DWITH_SYSTEMD=1"
LIBIDN: "-DWITH_LIBIDN=1" LIBIDN: "-DWITH_LIBIDN=1"
LITESQL: "-DWITH_LITESQL=1" SQLITE3: "-DWITH_SQLITE3=1"
# #
## Build jobs ## Build jobs
@@ -33,8 +33,8 @@ variables:
tags: tags:
- docker - docker
script: script:
- "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL}" - "echo Running cmake with the following parameters: -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3}"
- cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL} - cmake .. -DCMAKE_CXX_COMPILER=${COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3}
- make everything -j$(nproc || echo 1) - make everything -j$(nproc || echo 1)
- make coverage_check -j$(nproc || echo 1) - make coverage_check -j$(nproc || echo 1)
artifacts: artifacts:
@@ -77,19 +77,19 @@ build:2:
build:3: build:3:
variables: variables:
LITESQL: "-DWITHOUT_LITESQL=1" SQLITE3: "-DWITHOUT_SQLITE3=1"
<<: *fedora_build <<: *fedora_build
build:4: build:4:
variables: variables:
LITESQL: "-DWITHOUT_LITESQL=1" SQLITE3: "-DWITHOUT_SQLITE3=1"
BOTAN: "-DWITHOUT_BOTAN=1" BOTAN: "-DWITHOUT_BOTAN=1"
LIBIDN: "-DWITHOUT_LIBIDN=1" LIBIDN: "-DWITHOUT_LIBIDN=1"
<<: *fedora_build <<: *fedora_build
build:5: build:5:
variables: variables:
LITESQL: "-DWITHOUT_LITESQL=1" SQLITE3: "-DWITHOUT_SQLITE3=1"
UDNS: "-DWITHOUT_UDNS=1" UDNS: "-DWITHOUT_UDNS=1"
<<: *fedora_build <<: *fedora_build
@@ -163,7 +163,7 @@ test:freebsd:
SYSTEMD: "-DWITHOUT_SYSTEMD=1" SYSTEMD: "-DWITHOUT_SYSTEMD=1"
stage: test stage: test
script: script:
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${LITESQL} - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${BOTAN} ${UDNS} ${SYSTEMD} ${LIBIDN} ${SQLITE3}
- make check - make check
- make e2e - make e2e
@@ -303,11 +303,6 @@ packaging:archlinux:
image: docker.louiz.org/biboumi-test-archlinux:latest image: docker.louiz.org/biboumi-test-archlinux:latest
before_script: [] before_script: []
script: script:
- sudo pacman -Syuu --noconfirm
- git clone https://aur.archlinux.org/litesql-git.git
- cd litesql-git
- makepkg -si --noconfirm
- cd ..
- git clone https://aur.archlinux.org/biboumi-git.git - git clone https://aur.archlinux.org/biboumi-git.git
- cd biboumi-git - cd biboumi-git
- makepkg -si --noconfirm - makepkg -si --noconfirm
docker/biboumi-test/alpine/Dockerfile
+47 -3
View File
@@ -1,10 +1,54 @@
# 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.louiz.org/biboumi-test-alpine-base FROM docker.io/alpine:latest
# Install litesql ENV LC_ALL C.UTF-8
RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && cd /litesql/build && make install && rm -rf /litesql && ldconfig || true
# Needed to build biboumi
RUN apk add --no-cache g++\
clang\
valgrind\
udns-dev\
c-ares-dev\
sqlite-dev\
libuuid\
util-linux-dev\
libgcrypt-dev\
cmake\
make\
expat-dev\
libidn-dev\
git\
py3-lxml\
libtool\
py3-pip\
python2\
python3-dev\
automake\
autoconf\
flex\
bison\
libltdl\
openssl\
libressl-dev\
zlib-dev\
curl
# 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 adduser tester -D -h /home/tester
# Install charybdis, for e2e tests
RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install && rm -rf /charybdis
RUN chown -R tester:tester /home/tester/ircd
RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
WORKDIR /home/tester WORKDIR /home/tester
USER tester USER tester
docker/biboumi-test/alpine/Dockerfile.base
-51
View File
@@ -1,51 +0,0 @@
# 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/alpine:latest
ENV LC_ALL C.UTF-8
# Needed to build biboumi
RUN apk add --no-cache g++\
clang\
valgrind\
udns-dev\
c-ares-dev\
sqlite-dev\
libuuid\
util-linux-dev\
libgcrypt-dev\
cmake\
make\
expat-dev\
libidn-dev\
git\
py3-lxml\
libtool\
py3-pip\
python2\
python3-dev\
automake\
autoconf\
flex\
bison\
libltdl\
openssl\
libressl-dev\
zlib-dev\
curl
# 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 adduser tester -D -h /home/tester
# Install charybdis, for e2e tests
RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install && rm -rf /charybdis
RUN chown -R tester:tester /home/tester/ircd
RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
docker/biboumi-test/debian/Dockerfile
+53 -3
View File
@@ -1,10 +1,60 @@
# 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.louiz.org/biboumi-test-debian-base FROM docker.io/debian:latest
# Install litesql ENV LC_ALL C.UTF-8
RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && cd /litesql/build && make install && rm -rf /litesql && ldconfig
RUN apt update
# Needed to build biboumi
RUN apt install -y g++\
clang\
valgrind\
libudns-dev\
libc-ares-dev\
libsqlite3-dev\
libuuid1\
libgcrypt20-dev\
cmake\
make\
libexpat1-dev\
libidn11-dev\
uuid-dev\
libsystemd-dev\
pandoc\
libasan1\
libubsan0\
git\
python3-lxml\
lcov\
libtool\
python3-pip\
python3-dev\
automake\
autoconf\
flex\
bison\
libltdl-dev\
openssl\
zlib1g-dev\
libssl-dev\
curl
# 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 useradd tester -m
# Install charybdis, for e2e tests
RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install && rm -rf /charybdis
RUN chown -R tester:tester /home/tester/ircd
RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
WORKDIR /home/tester WORKDIR /home/tester
USER tester USER tester
docker/biboumi-test/debian/Dockerfile.base
-57
View File
@@ -1,57 +0,0 @@
# 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
ENV LC_ALL C.UTF-8
RUN apt update
# Needed to build biboumi
RUN apt install -y g++\
clang\
valgrind\
libudns-dev\
libc-ares-dev\
libsqlite3-dev\
libuuid1\
libgcrypt20-dev\
cmake\
make\
libexpat1-dev\
libidn11-dev\
uuid-dev\
libsystemd-dev\
pandoc\
libasan1\
libubsan0\
git\
python3-lxml\
lcov\
libtool\
python3-pip\
python3-dev\
automake\
autoconf\
flex\
bison\
libltdl-dev\
openssl\
zlib1g-dev\
libssl-dev\
curl
# 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 useradd tester -m
# Install charybdis, for e2e tests
RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin && make -j8 && make install && rm -rf /charybdis
RUN chown -R tester:tester /home/tester/ircd
RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
docker/biboumi-test/fedora/Dockerfile
+55 -3
View File
@@ -1,10 +1,62 @@
# 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.louiz.org/biboumi-test-fedora-base FROM docker.io/fedora:latest
# Install litesql ENV LC_ALL C.UTF-8
RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && cd /litesql/build && make install && ldconfig && rm -rf /litesql
RUN dnf --refresh install -y\
gcc-c++\
clang\
valgrind\
udns-devel\
c-ares-devel\
sqlite-devel\
libuuid-devel\
libgcrypt-devel\
cmake\
make\
expat-devel\
libidn-devel\
uuid-devel\
systemd-devel\
pandoc\
libasan\
libubsan\
git\
fedora-packager\
python3-lxml\
lcov\
rpmdevtools\
python3-devel\
automake\
autoconf\
flex\
flex-devel\
bison\
libtool-ltdl-devel\
libtool\
openssl-devel\
which\
java-1.8.0-openjdk\
&& dnf clean all
# Install botan
RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && ldconfig && rm -rf /botan
# Install slixmpp, for e2e tests
RUN git clone git://git.louiz.org/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
RUN useradd tester
# Install charybdis, for e2e tests
RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install && rm -rf /charybdis
RUN chown -R tester:tester /home/tester/ircd
RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
COPY coverity /home/tester/coverity
WORKDIR /home/tester WORKDIR /home/tester
USER tester USER tester
docker/biboumi-test/fedora/Dockerfile.base
-59
View File
@@ -1,59 +0,0 @@
# 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/fedora:latest
ENV LC_ALL C.UTF-8
RUN dnf --refresh install -y\
gcc-c++\
clang\
valgrind\
udns-devel\
c-ares-devel\
sqlite-devel\
libuuid-devel\
libgcrypt-devel\
cmake\
make\
expat-devel\
libidn-devel\
uuid-devel\
systemd-devel\
pandoc\
libasan\
libubsan\
git\
fedora-packager\
python3-lxml\
lcov\
rpmdevtools\
python3-devel\
automake\
autoconf\
flex\
flex-devel\
bison\
libtool-ltdl-devel\
libtool\
openssl-devel\
which\
java-1.8.0-openjdk\
&& dnf clean all
# Install botan
RUN git clone https://github.com/randombit/botan.git && cd botan && ./configure.py --prefix=/usr && make -j8 && make install && ldconfig && rm -rf /botan
# Install slixmpp, for e2e tests
RUN git clone git://git.louiz.org/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
RUN useradd tester
# Install charybdis, for e2e tests
RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && cd /charybdis && git checkout 4f2b9a4 && sed s/113/1113/ -i /charybdis/authd/providers/ident.c && ./autogen.sh && ./configure --prefix=/home/tester/ircd --bindir=/usr/bin --with-included-boost && make -j8 && make install && rm -rf /charybdis
RUN chown -R tester:tester /home/tester/ircd
RUN yes "" | openssl req -nodes -x509 -newkey rsa:4096 -keyout /home/tester/ircd/etc/ssl.key -out /home/tester/ircd/etc/ssl.pem
COPY coverity /home/tester/coverity
docker/biboumi/Dockerfile
+1 -4
View File
@@ -18,15 +18,12 @@ RUN apk add --no-cache\
# Install botan # Install botan
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 litesql
RUN git clone git://git.louiz.org/litesql && mkdir /litesql/build && cd /litesql/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr && make -j8 && cd /litesql/build && make install && rm -rf /litesql
# Install biboumi # Install biboumi
RUN git clone git://git.louiz.org/biboumi && mkdir ./biboumi/build && cd ./biboumi/build &&\ RUN git clone git://git.louiz.org/biboumi && mkdir ./biboumi/build && cd ./biboumi/build &&\
cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ cmake .. -DCMAKE_INSTALL_PREFIX=/usr\
-DCMAKE_BUILD_TYPE=Release\ -DCMAKE_BUILD_TYPE=Release\
-DWITH_BOTAN=1\ -DWITH_BOTAN=1\
-DWITH_LITESQL=1\ -DWITH_SQLITE3=1\
-DWITH_LIBIDN=1\ -DWITH_LIBIDN=1\
&& make -j8 && make install && rm -rf /biboumi && make -j8 && make install && rm -rf /biboumi