devs/cproof
1
2
Fork 1
Code Issues 43 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

build(docker): add TERM env, fix SSL and reflector handling

Browse Source 
- Add TERM=xterm-256color for PTY support in functional tests
- Disable SSL verification for git clone in restricted networks
- Add error handling for Arch reflector installation
This commit is contained in:
jabber.developer2
2026-01-06 20:06:05 +03:00
committed by Jabber Developer
parent e31240a4be
commit 44de29a199
5 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile.arch
View File

@@ -1,7 +1,11 @@
FROM archlinux FROM archlinux
ENV TERM=xterm
RUN pacman -Syu --noconfirm RUN pacman -Syu --noconfirm
RUN pacman -S --needed --noconfirm reflector && reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist # reflector is optional - if it fails due to network issues, continue with default mirrorlist
RUN pacman -S --needed --noconfirm reflector && \
(reflector --latest 20 --protocol https --sort rate --save /etc/pacman.d/mirrorlist || true)
RUN pacman-key --init RUN pacman-key --init
RUN pacman -S --needed --noconfirm \ RUN pacman -S --needed --noconfirm \
autoconf \ autoconf \
@@ -57,13 +61,13 @@ USER root
RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
WORKDIR /usr/src WORKDIR /usr/src
#RUN git clone https://github.com/boothj5/stabber RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
#WORKDIR /usr/src/stabber WORKDIR /usr/src/stabber
#RUN ./bootstrap.sh RUN ./bootstrap.sh
#RUN ./configure --prefix=/usr --disable-dependency-tracking RUN ./configure --prefix=/usr --disable-dependency-tracking
#RUN make RUN make
#RUN make install RUN make install
WORKDIR /usr/src/profanity WORKDIR /usr/src/profanity
COPY . /usr/src/profanity COPY . /usr/src/profanity

16
Dockerfile.debian
View File

@@ -1,11 +1,13 @@
# Build the latest Debian testing image # Build the latest Debian testing image
FROM debian:testing FROM debian:testing
ENV DEBIAN_FRONTEND="noninteractive"
ENV TERM=xterm
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
autoconf \ autoconf \
autoconf-archive \ autoconf-archive \
automake \ automake \
expect \
gcc \ gcc \
git \ git \
libcmocka-dev \ libcmocka-dev \
@@ -35,14 +37,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN mkdir -p /usr/src/{stabber,libstrophe,profanity} RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
WORKDIR /usr/src WORKDIR /usr/src
#RUN git clone https://github.com/boothj5/stabber RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
#WORKDIR /usr/src/stabber WORKDIR /usr/src/stabber
#RUN ./bootstrap.sh RUN ./bootstrap.sh
#RUN ./configure --prefix=/usr --disable-dependency-tracking RUN ./configure --prefix=/usr --disable-dependency-tracking
#RUN make RUN make
#RUN make install RUN make install
WORKDIR /usr/src/libstrophe WORKDIR /usr/src/libstrophe
RUN ./bootstrap.sh RUN ./bootstrap.sh

16
Dockerfile.fedora
View File

@@ -1,7 +1,6 @@
# Build the latest Fedora image # Build the latest Fedora image
FROM fedora:latest FROM fedora:latest
# expect - for functional tests
# libmicrohttpd - for stabber # libmicrohttpd - for stabber
# glibc-locale - to have en_US locale # glibc-locale - to have en_US locale
RUN dnf install -y \ RUN dnf install -y \
@@ -9,7 +8,6 @@ RUN dnf install -y \
autoconf-archive \ autoconf-archive \
automake \ automake \
awk \ awk \
expect-devel \
gcc \ gcc \
git \ git \
glib2-devel \ glib2-devel \
@@ -42,17 +40,17 @@ RUN dnf install -y \
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
ENV TERM=xterm
RUN mkdir -p /usr/src RUN mkdir -p /usr/src
WORKDIR /usr/src WORKDIR /usr/src
#RUN mkdir -p /usr/src/stabber RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
#RUN git clone https://github.com/boothj5/stabber WORKDIR /usr/src/stabber
#WORKDIR /usr/src/stabber RUN ./bootstrap.sh
#RUN ./bootstrap.sh RUN ./configure --prefix=/usr --disable-dependency-tracking
#RUN ./configure --prefix=/usr --disable-dependency-tracking RUN make
#RUN make RUN make install
#RUN make install
WORKDIR /usr/src WORKDIR /usr/src
RUN mkdir -p /usr/src/libstrophe RUN mkdir -p /usr/src/libstrophe

16
Dockerfile.tumbleweed
View File

@@ -1,14 +1,12 @@
# Build the latest openSUSE Tumbleweed image # Build the latest openSUSE Tumbleweed image
FROM opensuse/tumbleweed FROM opensuse/tumbleweed
# expect - for functional tests
# libmicrohttpd - for stabber # libmicrohttpd - for stabber
# glibc-locale - to have en_US locale # glibc-locale - to have en_US locale
RUN zypper --non-interactive in --no-recommends \ RUN zypper --non-interactive in --no-recommends \
autoconf \ autoconf \
autoconf-archive \ autoconf-archive \
automake \ automake \
expect-devel \
gcc \ gcc \
git \ git \
glib2-devel \ glib2-devel \
@@ -41,17 +39,17 @@ RUN zypper --non-interactive in --no-recommends \
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
ENV TERM=xterm
RUN mkdir -p /usr/src RUN mkdir -p /usr/src
WORKDIR /usr/src WORKDIR /usr/src
#RUN mkdir -p /usr/src/stabber RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
#RUN git clone git://github.com/boothj5/stabber.git WORKDIR /usr/src/stabber
#WORKDIR /usr/src/stabber RUN ./bootstrap.sh
#RUN ./bootstrap.sh RUN ./configure --prefix=/usr --disable-dependency-tracking
#RUN ./configure --prefix=/usr --disable-dependency-tracking RUN make
#RUN make RUN make install
#RUN make install
RUN mkdir -p /usr/src/profanity RUN mkdir -p /usr/src/profanity
WORKDIR /usr/src/profanity WORKDIR /usr/src/profanity

15
Dockerfile.ubuntu
View File

@@ -1,12 +1,12 @@
FROM ubuntu:latest FROM ubuntu:latest
ENV DEBIAN_FRONTEND="noninteractive" ENV DEBIAN_FRONTEND="noninteractive"
ENV TERM=xterm
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
autoconf \ autoconf \
autoconf-archive \ autoconf-archive \
automake \ automake \
expect \
gcc \ gcc \
git \ git \
libcmocka-dev \ libcmocka-dev \
@@ -36,15 +36,14 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
RUN mkdir -p /usr/src/{stabber,libstrophe,profanity} RUN mkdir -p /usr/src/{stabber,libstrophe,profanity}
WORKDIR /usr/src WORKDIR /usr/src
#RUN git clone https://github.com/boothj5/stabber RUN git clone -c http.sslverify=false https://git.jabber.space/devs/stabber
RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe RUN git clone -c http.sslverify=false https://github.com/strophe/libstrophe
# TODO: Re-enable once libmicrohttpd-dev has been updated. WORKDIR /usr/src/stabber
#WORKDIR /usr/src/stabber RUN ./bootstrap.sh
#RUN ./bootstrap.sh RUN ./configure --prefix=/usr --disable-dependency-tracking
#RUN ./configure --prefix=/usr --disable-dependency-tracking RUN make
#RUN make RUN make install
#RUN make install
WORKDIR /usr/src/libstrophe WORKDIR /usr/src/libstrophe
RUN ./bootstrap.sh RUN ./bootstrap.sh