diff options
| author | louiz’ <louiz@louiz.org> | 2017-08-01 22:16:26 +0200 |
|---|---|---|
| committer | louiz’ <louiz@louiz.org> | 2017-08-01 22:16:26 +0200 |
| commit | 71ea9e5d21440d0f2f70fcef3b4f69debcb16d4c (patch) | |
| tree | 8b1269a3c82e79c025e0d042eaa783d90dec8cd2 | |
| parent | 8c92473a6681aaf671b21780202dde731772cee8 (diff) | |
| parent | dc8f07a566a0bef9af00d16f881a0f91949a9688 (diff) | |
| download | biboumi-71ea9e5d21440d0f2f70fcef3b4f69debcb16d4c.tar.gz biboumi-71ea9e5d21440d0f2f70fcef3b4f69debcb16d4c.tar.bz2 biboumi-71ea9e5d21440d0f2f70fcef3b4f69debcb16d4c.tar.xz biboumi-71ea9e5d21440d0f2f70fcef3b4f69debcb16d4c.zip | |
Merge branch 'master' into debian
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | docker/biboumi-test/debian/Dockerfile | 5 | ||||
| -rw-r--r-- | docker/biboumi-test/fedora/Dockerfile | 3 | ||||
| -rw-r--r-- | docker/biboumi/alpine/biboumi.cfg | 4 |
4 files changed, 12 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e51186..23741ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,8 +4,10 @@ stages: before_script: - uname -a - whoami - - mkdir -p build/ - - cd build/ + +# +## Packaging jobs +# packaging:deb: stage: packaging @@ -14,7 +16,7 @@ packaging:deb: - debian@louiz/biboumi tags: - docker - image: docker.louiz.org/packaging-debian:latest + image: docker.louiz.org/louiz/biboumi/packaging-debian:latest before_script: [] script: - git checkout debian diff --git a/docker/biboumi-test/debian/Dockerfile b/docker/biboumi-test/debian/Dockerfile index 232a585..3a1c1a7 100644 --- a/docker/biboumi-test/debian/Dockerfile +++ b/docker/biboumi-test/debian/Dockerfile @@ -23,7 +23,7 @@ RUN apt install -y g++\ uuid-dev\ libsystemd-dev\ pandoc\ - libasan1\ + libasan3\ libubsan0\ git\ python3-lxml\ @@ -54,7 +54,8 @@ RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && RUN chown -R tester:tester /home/tester/ircd +USER tester + 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 -USER tester diff --git a/docker/biboumi-test/fedora/Dockerfile b/docker/biboumi-test/fedora/Dockerfile index 384fd51..8ff418c 100644 --- a/docker/biboumi-test/fedora/Dockerfile +++ b/docker/biboumi-test/fedora/Dockerfile @@ -54,9 +54,10 @@ RUN git clone https://github.com/charybdis-ircd/charybdis.git && cd charybdis && RUN chown -R tester:tester /home/tester/ircd +USER tester + 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 -USER tester diff --git a/docker/biboumi/alpine/biboumi.cfg b/docker/biboumi/alpine/biboumi.cfg index 98c5a9f..841b5e5 100644 --- a/docker/biboumi/alpine/biboumi.cfg +++ b/docker/biboumi/alpine/biboumi.cfg @@ -1,6 +1,6 @@ -xmpp_server_ip=127.0.0.1 +xmpp_server_ip=xmpp port=5347 db_name=/var/lib/biboumi/biboumi.sqlite -hostname=xmpp +hostname= password= admin= |