ci: update dockerfiles
oragono got renamed, and distros have been updated in the last decade
This commit is contained in:
@@ -33,7 +33,7 @@ RUN apk add --no-cache libidn libpq libstdc++ libuuid postgresql-libs \
|
|||||||
COPY --from=builder /etc/biboumi /etc/biboumi
|
COPY --from=builder /etc/biboumi /etc/biboumi
|
||||||
COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi
|
COPY --from=builder /usr/bin/biboumi /usr/bin/biboumi
|
||||||
|
|
||||||
COPY ./biboumi.cfg /etc/biboumi/biboumi.cfg
|
COPY ./docker/biboumi/alpine/biboumi.cfg /etc/biboumi/biboumi.cfg
|
||||||
|
|
||||||
RUN adduser biboumi -D -h /home/biboumi && \
|
RUN adduser biboumi -D -h /home/biboumi && \
|
||||||
mkdir /var/lib/biboumi && \
|
mkdir /var/lib/biboumi && \
|
||||||
|
|||||||
@@ -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/alpine:latest
|
FROM alpine:latest
|
||||||
|
|
||||||
ENV LC_ALL C.UTF-8
|
ENV LC_ALL C.UTF-8
|
||||||
|
|
||||||
@@ -26,10 +26,12 @@ py3-lxml \
|
|||||||
python3-dev \
|
python3-dev \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
go \
|
go \
|
||||||
|
rust \
|
||||||
|
cargo \
|
||||||
wget
|
wget
|
||||||
|
|
||||||
# Install oragono, for e2e tests
|
# Install oragono, for e2e tests
|
||||||
RUN wget "https://github.com/oragono/oragono/archive/v2.0.0.tar.gz" && tar xvf "v2.0.0.tar.gz" && cd "oragono-2.0.0" && make && cp ~/go/bin/oragono /usr/local/bin
|
RUN wget "https://github.com/ergochat/ergo/archive/v2.0.0.tar.gz" && tar xvf "v2.0.0.tar.gz" && cd "ergo-2.0.0" && make && cp ~/go/bin/oragono /usr/local/bin/oragono
|
||||||
|
|
||||||
# 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 https://lab.louiz.org/poezio/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
|
RUN pip3 install slixmpp --break-system-packages
|
||||||
|
|||||||
@@ -1,18 +1,16 @@
|
|||||||
# 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:buster
|
FROM debian:bookworm
|
||||||
|
|
||||||
ENV LC_ALL C.UTF-8
|
ENV LC_ALL=C.UTF-8
|
||||||
|
|
||||||
RUN apt update
|
RUN apt update && apt install -y --no-install-recommends \
|
||||||
|
|
||||||
# Needed to build biboumi
|
|
||||||
RUN apt install -y --no-install-recommends \
|
|
||||||
git \
|
git \
|
||||||
make \
|
make \
|
||||||
cmake \
|
cmake \
|
||||||
g++ \
|
g++ \
|
||||||
|
ca-certificates \
|
||||||
libuuid1 \
|
libuuid1 \
|
||||||
libudns-dev \
|
libudns-dev \
|
||||||
libexpat1-dev \
|
libexpat1-dev \
|
||||||
@@ -24,15 +22,10 @@ uuid-dev \
|
|||||||
libgcrypt20-dev \
|
libgcrypt20-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
valgrind \
|
valgrind \
|
||||||
libasan5 \
|
libasan6 \
|
||||||
libubsan0 \
|
libubsan1 \
|
||||||
python3-pip \
|
|
||||||
python3-lxml \
|
python3-lxml \
|
||||||
python3-dev \
|
python3-slixmpp \
|
||||||
wget
|
wget
|
||||||
|
|
||||||
RUN wget "https://github.com/oragono/oragono/releases/download/v2.0.0/oragono-2.0.0-linux-x64.tar.gz" && tar xvf oragono-2.0.0-linux-x64.tar.gz && cp oragono-2.0.0-linux-x64/oragono /usr/local/bin
|
RUN wget "https://github.com/oragono/oragono/releases/download/v2.0.0/oragono-2.0.0-linux-x64.tar.gz" && tar xvf oragono-2.0.0-linux-x64.tar.gz && cp oragono-2.0.0-linux-x64/oragono /usr/local/bin
|
||||||
|
|
||||||
# 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 https://lab.louiz.org/poezio/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
# 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/fedora:32
|
FROM fedora:latest
|
||||||
|
|
||||||
ENV LC_ALL C.UTF-8
|
ENV LC_ALL=C.UTF-8
|
||||||
|
|
||||||
RUN dnf --refresh install -y \
|
RUN dnf --refresh install -y \
|
||||||
git \
|
git \
|
||||||
@@ -35,7 +35,7 @@ rpmdevtools \
|
|||||||
&& dnf clean all
|
&& dnf clean all
|
||||||
|
|
||||||
# Install slixmpp, for e2e tests
|
# Install slixmpp, for e2e tests
|
||||||
RUN git clone https://lab.louiz.org/poezio/slixmpp && pip3 install pyasn1 && cd slixmpp && python3 setup.py build && python3 setup.py install
|
RUN pip3 install --break-system-packages slixmpp
|
||||||
|
|
||||||
# Install oragono, for e2e tests
|
# Install oragono, for e2e tests
|
||||||
RUN wget "https://github.com/oragono/oragono/releases/download/v2.0.0/oragono-2.0.0-linux-x64.tar.gz" && tar xvf oragono-2.0.0-linux-x64.tar.gz && cp oragono-2.0.0-linux-x64/oragono /usr/local/bin
|
RUN wget "https://github.com/oragono/oragono/releases/download/v2.0.0/oragono-2.0.0-linux-x64.tar.gz" && tar xvf oragono-2.0.0-linux-x64.tar.gz && cp oragono-2.0.0-linux-x64/oragono /usr/local/bin
|
||||||
|
|||||||
Reference in New Issue
Block a user