Compare commits

..

1 Commits

Author SHA1 Message Date
2be16df905 ci(docker): add Docker publishing workflow and Dockerfile
All checks were successful
CI Code / Check spelling (pull_request) Successful in 13s
CI Code / Check coding style (pull_request) Successful in 24s
CI Code / Code Coverage (pull_request) Successful in 3m42s
CI Code / Linux (debian) (pull_request) Successful in 5m13s
CI Code / Linux (ubuntu) (pull_request) Successful in 5m18s
CI Code / Linux (arch) (pull_request) Successful in 6m59s
CI Code / Check spelling (push) Successful in 13s
CI Code / Check coding style (push) Successful in 23s
CI Code / Code Coverage (push) Successful in 3m38s
Publish Docker image / Push Docker image to Docker Hub (push) Successful in 4m46s
CI Code / Linux (debian) (push) Successful in 5m26s
CI Code / Linux (ubuntu) (push) Successful in 5m33s
CI Code / Linux (arch) (push) Successful in 7m10s
Introduce GitHub Actions workflow for automated Docker image
publishing to Docker Hub, along with a dedicated Dockerfile in
the ci directory to streamline container builds.
2026-07-11 17:43:16 +00:00
4 changed files with 242 additions and 121 deletions

44
.github/workflows/docker-publish.yml vendored Normal file
View File

@@ -0,0 +1,44 @@
name: Publish Docker image
on:
push:
branches: [master]
release:
types: [published]
jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
permissions:
contents: read
steps:
- name: Check out the repo
uses: actions/checkout@v7
- name: Log in to Docker Hub
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051
with:
images: cproofdev/cproof
tags: |
type=raw,value=dev,enable={{is_default_branch}}
type=sha,prefix=nightly-,enable={{is_default_branch}}
type=ref,event=tag
type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/') }}
- name: Build and push Docker image
id: push
uses: docker/build-push-action@2bd26e71295ee32cbf6a73510d165bf7232460f3
with:
context: .
file: ./ci/Dockerfile
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

106
ci/Dockerfile Normal file
View File

@@ -0,0 +1,106 @@
# =============================================================================
# Stage 1: Build
# =============================================================================
FROM ubuntu:26.04 AS builder
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
build-essential \
autoconf \
automake \
autoconf-archive \
ca-certificates \
libtool \
pkg-config \
git \
wget \
libglib2.0-dev \
libcurl4-openssl-dev \
libsqlite3-dev \
libncurses-dev \
libreadline-dev \
libnotify-dev \
python3-dev \
python3 \
libgpgme-dev \
libotr5-dev \
libgtk-3-dev \
libgdk-pixbuf-2.0-dev \
libsignal-protocol-c-dev \
libgcrypt20-dev \
libqrencode-dev \
libxss-dev \
libcmocka-dev \
&& rm -rf /var/lib/apt/lists/*
# Build libstrophe from source (not available as Ubuntu package)
RUN git clone --depth 1 https://git.jabber.space/devs/libstrophe-gh-mirror.git /tmp/libstrophe \
&& cd /tmp/libstrophe \
&& autoreconf -i \
&& ./configure --prefix=/usr \
&& make -j$(nproc) \
&& make install \
&& rm -rf /tmp/libstrophe
WORKDIR /src
COPY . .
RUN ./bootstrap.sh \
&& ./configure \
--enable-notifications \
--enable-icons-and-clipboard \
--enable-otr \
--enable-pgp \
--enable-omemo \
--enable-plugins \
--enable-c-plugins \
--enable-python-plugins \
--with-xscreensaver \
--enable-omemo-qrcode \
--enable-gdk-pixbuf \
&& make -j$(nproc) \
&& make install
# =============================================================================
# Stage 2: Runtime (minimal)
# =============================================================================
FROM ubuntu:26.04
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
libglib2.0-0t64 \
libcurl4t64 \
libsqlite3-0 \
libncursesw6 \
libreadline8t64 \
libnotify4 \
python3 \
libpython3.14 \
libgpgme45 \
libotr5t64 \
libgtk-3-0t64 \
libgdk-pixbuf-2.0-0 \
libsignal-protocol-c2.3.2 \
libgcrypt20 \
libqrencode4 \
libxss1 \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get clean
COPY --from=builder /usr/local/bin/profanity /usr/local/bin/profanity
COPY --from=builder /usr/local/lib/libprofanity* /usr/local/lib/
COPY --from=builder /usr/local/include/profapi.h /usr/local/include/
COPY --from=builder /usr/local/share/profanity /usr/local/share/profanity
COPY --from=builder /usr/lib/libstrophe.so* /usr/lib/
RUN ldconfig
RUN ldd /usr/local/bin/profanity | grep 'not found' && exit 1 || true
RUN mkdir -p /root/.config/profanity
ENTRYPOINT ["profanity"]

View File

@@ -110,8 +110,6 @@ static char* _software_autocomplete(ProfWin* window, const char* const input, gb
static char* _url_autocomplete(ProfWin* window, const char* const input, gboolean previous);
static char* _executable_autocomplete(ProfWin* window, const char* const input, gboolean previous);
static char* _lastactivity_autocomplete(ProfWin* window, const char* const input, gboolean previous);
static char* _disco_autocomplete(ProfWin* window, const char* const input, gboolean previous);
static char* _roster_jid_autocomplete(const char* const input, const char* const prefix, gboolean previous);
static char* _intype_autocomplete(ProfWin* window, const char* const input, gboolean previous);
static char* _mood_autocomplete(ProfWin* window, const char* const input, gboolean previous);
static char* _strophe_autocomplete(ProfWin* window, const char* const input, gboolean previous);
@@ -124,7 +122,6 @@ static char* _ai_autocomplete(ProfWin* window, const char* const input, gboolean
static char* _script_autocomplete_func(const char* const prefix, gboolean previous, void* context);
static char* _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previous);
static gboolean _is_connected(void);
static Autocomplete commands_ac;
static Autocomplete who_room_ac;
@@ -1429,7 +1426,6 @@ cmd_ac_init(void)
g_hash_table_insert(ac_funcs, "/color", _color_autocomplete);
g_hash_table_insert(ac_funcs, "/connect", _connect_autocomplete);
g_hash_table_insert(ac_funcs, "/console", _console_autocomplete);
g_hash_table_insert(ac_funcs, "/disco", _disco_autocomplete);
g_hash_table_insert(ac_funcs, "/correct", _correct_autocomplete);
g_hash_table_insert(ac_funcs, "/correction", _correction_autocomplete);
g_hash_table_insert(ac_funcs, "/executable", _executable_autocomplete);
@@ -1866,12 +1862,10 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
}
gchar* history_jid_subcmds[] = { "/history verify", "/history export", "/history import" };
if (conn_status == JABBER_CONNECTED) {
for (size_t i = 0; i < ARRAY_SIZE(history_jid_subcmds); i++) {
result = autocomplete_param_with_func(input, history_jid_subcmds[i], roster_barejid_autocomplete, previous, NULL);
if (result) {
return result;
}
for (size_t i = 0; i < ARRAY_SIZE(history_jid_subcmds); i++) {
result = autocomplete_param_with_func(input, history_jid_subcmds[i], roster_barejid_autocomplete, previous, NULL);
if (result) {
return result;
}
}
@@ -1947,6 +1941,7 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
Autocomplete completer;
} ac_cmds[] = {
{ "/prefs", prefs_ac },
{ "/disco", disco_ac },
{ "/room", room_ac },
{ "/mainwin", winpos_ac },
{ "/inputwin", winpos_ac },
@@ -1996,31 +1991,6 @@ _cmd_ac_complete_params(ProfWin* window, const char* const input, gboolean previ
return NULL;
}
static gboolean
_is_connected(void)
{
return connection_get_status() == JABBER_CONNECTED;
}
static char*
_roster_jid_autocomplete(const char* const input, const char* const prefix, gboolean previous)
{
if (!_is_connected()) {
return NULL;
}
char* result = NULL;
result = autocomplete_param_with_func(input, prefix, roster_contact_autocomplete, previous, NULL);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, prefix, roster_barejid_autocomplete, previous, NULL);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, prefix, roster_fulljid_autocomplete, previous, NULL);
return result;
}
static char*
_caps_autocomplete(ProfWin* window, const char* const input, gboolean previous)
{
@@ -2036,29 +2006,20 @@ _caps_autocomplete(ProfWin* window, const char* const input, gboolean previous)
if (nick_ac) {
result = autocomplete_param_with_ac(input, "/caps", nick_ac, TRUE, previous);
}
} else {
result = _roster_jid_autocomplete(input, "/caps", previous);
} else if (connection_get_status() == JABBER_CONNECTED) {
result = autocomplete_param_with_func(input, "/caps", roster_contact_autocomplete, previous, NULL);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, "/caps", roster_barejid_autocomplete, previous, NULL);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, "/caps", roster_fulljid_autocomplete, previous, NULL);
}
return result;
}
static char*
_disco_autocomplete(ProfWin* window, const char* const input, gboolean previous)
{
char* result = NULL;
result = autocomplete_param_with_ac(input, "/disco", disco_ac, TRUE, previous);
if (result) {
return result;
}
result = _roster_jid_autocomplete(input, "/disco info", previous);
if (result) {
return result;
}
result = _roster_jid_autocomplete(input, "/disco items", previous);
return result;
}
static char*
_sub_autocomplete(ProfWin* window, const char* const input, gboolean previous)
{
@@ -3737,7 +3698,7 @@ _win_autocomplete(ProfWin* window, const char* const input, gboolean previous)
}
char* unquoted = strip_arg_quotes(input);
result = _roster_jid_autocomplete(input, "/win", previous);
result = autocomplete_param_with_func(unquoted, "/win", roster_contact_autocomplete, previous, NULL);
free(unquoted);
return result;
}
@@ -4071,14 +4032,18 @@ _invite_autocomplete(ProfWin* window, const char* const input, gboolean previous
return result;
}
result = _roster_jid_autocomplete(input, "/invite send", previous);
if (result) {
return result;
}
jabber_conn_status_t conn_status = connection_get_status();
result = autocomplete_param_with_func(input, "/invite decline", muc_invites_find, previous, NULL);
if (result) {
return result;
if (conn_status == JABBER_CONNECTED) {
result = autocomplete_param_with_func(input, "/invite send", roster_contact_autocomplete, previous, NULL);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, "/invite decline", muc_invites_find, previous, NULL);
if (result) {
return result;
}
}
return NULL;
@@ -4094,37 +4059,42 @@ _status_autocomplete(ProfWin* window, const char* const input, gboolean previous
return result;
}
// complete with: online, away etc.
result = autocomplete_param_with_ac(input, "/status set", account_status_ac, TRUE, previous);
if (result) {
return result;
}
jabber_conn_status_t conn_status = connection_get_status();
// Remove quote character before and after names when doing autocomplete
char* unquoted = strip_arg_quotes(input);
if (conn_status == JABBER_CONNECTED) {
// MUC completion with nicknames
if (window->type == WIN_MUC) {
ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
if (nick_ac) {
result = autocomplete_param_with_ac(unquoted, "/status get", nick_ac, TRUE, previous);
// complete with: online, away etc.
result = autocomplete_param_with_ac(input, "/status set", account_status_ac, TRUE, previous);
if (result) {
return result;
}
// Remove quote character before and after names when doing autocomplete
char* unquoted = strip_arg_quotes(input);
// MUC completion with nicknames
if (window->type == WIN_MUC) {
ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
Autocomplete nick_ac = muc_roster_ac(mucwin->roomjid);
if (nick_ac) {
result = autocomplete_param_with_ac(unquoted, "/status get", nick_ac, TRUE, previous);
if (result) {
free(unquoted);
return result;
}
}
// roster completion
} else {
result = autocomplete_param_with_func(unquoted, "/status get", roster_contact_autocomplete, previous, NULL);
if (result) {
free(unquoted);
return result;
}
}
// roster completion
} else {
result = _roster_jid_autocomplete(input, "/status get", previous);
if (result) {
free(unquoted);
return result;
}
}
free(unquoted);
free(unquoted);
}
return NULL;
}
@@ -4232,12 +4202,14 @@ _software_autocomplete(ProfWin* window, const char* const input, gboolean previo
{
char* result = NULL;
if (window->type == WIN_CHAT && _is_connected()) {
if (window->type == WIN_CHAT) {
ProfChatWin* chatwin = (ProfChatWin*)window;
assert(chatwin->memcheck == PROFCHATWIN_MEMCHECK);
auto_gchar gchar* search_str = g_strdup_printf("/software %s", chatwin->barejid);
result = autocomplete_param_with_func(search_str, "/software", roster_fulljid_autocomplete, previous, NULL);
GString* search_str = g_string_new("/software ");
g_string_append(search_str, chatwin->barejid);
result = autocomplete_param_with_func(search_str->str, "/software", roster_fulljid_autocomplete, previous, NULL);
g_string_free(search_str, TRUE);
} else if (window->type == WIN_MUC) {
ProfMucWin* mucwin = (ProfMucWin*)window;
assert(mucwin->memcheck == PROFMUCWIN_MEMCHECK);
@@ -4251,7 +4223,10 @@ _software_autocomplete(ProfWin* window, const char* const input, gboolean previo
}
}
} else {
result = _roster_jid_autocomplete(input, "/software", previous);
result = autocomplete_param_with_func(input, "/software", roster_fulljid_autocomplete, previous, NULL);
if (result) {
return result;
}
}
return result;
@@ -4350,11 +4325,16 @@ _lastactivity_autocomplete(ProfWin* window, const char* const input, gboolean pr
return result;
}
result = autocomplete_param_with_func(input, "/lastactivity set", prefs_autocomplete_boolean_choice, previous, NULL);
if (result) {
return result;
jabber_conn_status_t conn_status = connection_get_status();
if (conn_status == JABBER_CONNECTED) {
result = autocomplete_param_with_func(input, "/lastactivity set", prefs_autocomplete_boolean_choice, previous, NULL);
if (result) {
return result;
}
result = autocomplete_param_with_func(input, "/lastactivity get", roster_barejid_autocomplete, previous, NULL);
}
result = _roster_jid_autocomplete(input, "/lastactivity get", previous);
return result;
}
@@ -4534,19 +4514,19 @@ _vcard_autocomplete(ProfWin* window, const char* const input, gboolean previous)
} else {
char* unquoted = strip_arg_quotes(input);
result = _roster_jid_autocomplete(input, "/vcard get", previous);
result = autocomplete_param_with_func(unquoted, "/vcard get", roster_contact_autocomplete, previous, NULL);
if (result) {
free(unquoted);
return result;
}
result = _roster_jid_autocomplete(input, "/vcard photo open", previous);
result = autocomplete_param_with_func(unquoted, "/vcard photo open", roster_contact_autocomplete, previous, NULL);
if (result) {
free(unquoted);
return result;
}
result = _roster_jid_autocomplete(input, "/vcard photo save", previous);
result = autocomplete_param_with_func(unquoted, "/vcard photo save", roster_contact_autocomplete, previous, NULL);
if (result) {
free(unquoted);
return result;

View File

@@ -110,15 +110,6 @@ static gboolean _cmd_execute_default(ProfWin* window, const char* inp);
static gboolean _cmd_execute_alias(ProfWin* window, const char* const inp, gboolean* ran);
static gboolean
_download_install_plugin(ProfWin* window, gchar* url, gchar* path);
static const gchar*
_resolve_contact_jid(const char* const name)
{
char* barejid = roster_barejid_from_name(name);
if (barejid == NULL) {
barejid = (char*)name;
}
return barejid;
}
static void
_vcard_editor_finished_cb(gchar* message, void* user_data)
@@ -3423,7 +3414,7 @@ cmd_caps(ProfWin* window, const char* const command, gchar** args)
case WIN_CONSOLE:
case WIN_XML:
if (args[0]) {
auto_jid Jid* jid = jid_create(_resolve_contact_jid(args[0]));
auto_jid Jid* jid = jid_create(args[0]);
if (jid == NULL || jid->fulljid == NULL) {
cons_show("You must provide a full jid to the /caps command.");
@@ -3465,7 +3456,7 @@ cmd_caps(ProfWin* window, const char* const command, gchar** args)
}
static void
_send_software_version_iq_to_fulljid(const gchar* const request)
_send_software_version_iq_to_fulljid(char* request)
{
auto_jid Jid* jid = jid_create(request);
@@ -3506,7 +3497,7 @@ cmd_software(ProfWin* window, const char* const command, gchar** args)
break;
case WIN_CHAT:
if (args[0]) {
_send_software_version_iq_to_fulljid(_resolve_contact_jid(args[0]));
_send_software_version_iq_to_fulljid(args[0]);
break;
} else {
ProfChatWin* chatwin = (ProfChatWin*)window;
@@ -3530,7 +3521,7 @@ cmd_software(ProfWin* window, const char* const command, gchar** args)
}
case WIN_CONSOLE:
if (args[0]) {
_send_software_version_iq_to_fulljid(_resolve_contact_jid(args[0]));
_send_software_version_iq_to_fulljid(args[0]);
} else {
cons_show("You must provide a jid to the /software command.");
}
@@ -4840,7 +4831,7 @@ cmd_disco(ProfWin* window, const char* const command, gchar** args)
return TRUE;
}
auto_gchar gchar* jid = g_strdup_printf("%s", args[1] ? _resolve_contact_jid(args[1]) : connection_get_jid()->domainpart);
auto_gchar gchar* jid = g_strdup_printf("%s", args[1] ?: connection_get_jid()->domainpart);
if (g_strcmp0(args[0], "info") == 0) {
iq_disco_info_request(jid);
@@ -5062,7 +5053,7 @@ cmd_lastactivity(ProfWin* window, const char* const command, gchar** args)
if (args[1] == NULL) {
iq_last_activity_request(connection_get_jid()->domainpart);
} else {
iq_last_activity_request(_resolve_contact_jid(args[1]));
iq_last_activity_request(args[1]);
}
return TRUE;
}
@@ -6415,17 +6406,17 @@ cmd_ping(ProfWin* window, const char* const command, gchar** args)
return TRUE;
}
if (args[0] != NULL) {
const gchar* ping_target = _resolve_contact_jid(args[0]);
if (caps_jid_has_feature(ping_target, XMPP_FEATURE_PING) == FALSE) {
cons_show("%s does not support ping requests.", ping_target);
return TRUE;
}
iq_send_ping(ping_target);
cons_show("Pinged %s…", ping_target);
} else {
iq_send_ping(NULL);
if (args[0] != NULL && caps_jid_has_feature(args[0], XMPP_FEATURE_PING) == FALSE) {
cons_show("%s does not support ping requests.", args[0]);
return TRUE;
}
iq_send_ping(args[0]);
if (args[0] == NULL) {
cons_show("Pinged server…");
} else {
cons_show("Pinged %s…", args[0]);
}
return TRUE;
}