From 9ecd37a4d99090ca995d890657a1bb4ae2bf9cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?William=20Wennerstr=C3=B6m?= Date: Mon, 20 Jul 2020 10:52:12 +0200 Subject: [PATCH] Change to .tar.zst archives that latest Arch devtools uses This is required because of: https://www.archlinux.org/news/now-using-zstandard-instead-of-xz-for-package-compression/ --- Dockerfile.arch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Dockerfile.arch b/Dockerfile.arch index 5ef305b6..a3644b9f 100644 --- a/Dockerfile.arch +++ b/Dockerfile.arch @@ -34,17 +34,23 @@ RUN useradd -mb /usr/src --shell=/bin/false aur && usermod -L aur USER aur WORKDIR /usr/src/aur + +# NOTE: These will change their extension to .tar.zst if a new snapshot is built +# 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.xz -RUN pacman -U --noconfirm libsignal-protocol-c/libsignal-protocol-c-*.pkg.tar.xz +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 git://github.com/boothj5/stabber.git