Skip to content

Commit

Permalink
Merge pull request #2009 from profanity-im/fix/2004-Dockerfile-archli…
Browse files Browse the repository at this point in the history
…nux-image

Enable Arch CI
  • Loading branch information
jubalh authored Jan 7, 2025
2 parents 313ab5d + 797e0bc commit baddf2a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
flavor: [debian, fedora, ubuntu]
flavor: [arch, debian, fedora, ubuntu]

name: Linux
steps:
Expand Down
7 changes: 2 additions & 5 deletions Dockerfile.arch
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM archlinux/latest
FROM archlinux

RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
autoconf \
Expand All @@ -18,6 +18,7 @@ RUN pacman -Syu --noconfirm && pacman -S --needed --noconfirm \
libgcrypt \
libmicrohttpd \
libnotify \
libsignal-protocol-c \
libotr \
libtool \
libxss \
Expand All @@ -41,18 +42,14 @@ WORKDIR /usr/src/aur
# due to:
# https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libstrophe-git.tar.gz
RUN wget https://aur.archlinux.org/cgit/aur.git/snapshot/libsignal-protocol-c.tar.gz

RUN tar -zxvf libstrophe-git.tar.gz
RUN tar -zxvf libsignal-protocol-c.tar.gz

RUN pushd libstrophe-git && makepkg && popd
RUN pushd libsignal-protocol-c && makepkg && popd

USER root

RUN pacman -U --noconfirm libstrophe-git/libstrophe-git-*.pkg.tar.zst
RUN pacman -U --noconfirm libsignal-protocol-c/libsignal-protocol-c-*.pkg.tar.zst

WORKDIR /usr/src
#RUN git clone https://github.com/boothj5/stabber
Expand Down

0 comments on commit baddf2a

Please sign in to comment.