diff --git a/aurutils/Containerfile b/aurutils/Containerfile index bebc26a..dd1d99a 100644 --- a/aurutils/Containerfile +++ b/aurutils/Containerfile @@ -1,6 +1,6 @@ FROM docker.io/archlinux/archlinux:latest -# Update pacma dtaabase +# Update pacman dtaabase # Initialize pacman key # Ensure archlinux-keyring package is up to date # Update all packages @@ -17,13 +17,14 @@ RUN pacman -S --noconfirm base-devel git curl jq man-db man-pages nano # Install additional aurutils dependencies # https://github.com/aurutils/aurutils/blob/release/makepkg/PKGBUILD#L14 -RUN pacman -S --noconfirm pacutils trurl perl perl-json-xs +RUN pacman -S --noconfirm pacutils bash perl perl-json-xs # Copy in makepkg config file, aur sudo ocnfig, custom repo config, and include custom repo config in main pacman config COPY --chown=root:root --chmod=0664 makepkg.conf /etc/makepkg.conf.d/makepkg.conf COPY --chown=root:root --chmod=0600 aur.sudo /etc/sudoers.d/aur COPY --chown=root:root --chmod=0664 home.repo.conf /etc/pacman.d/home.repo.conf +# Append text block to end of pacman.conf RUN cat <> /etc/pacman.conf [home] @@ -45,9 +46,13 @@ USER aur # Git clone the aur-utils repo # Checkout the latest release, fetching latest release version from github API via curl -RUN git clone https://github.com/aurutils/aurutils.git /aur/aurutils && \ - cd /aur/aurutils && \ - git switch --detach $(curl -sSfL https://api.github.com/repos/aurutils/aurutils/releases/latest | jq -r .tag_name) +# 2026-07-02 switch source from github to AUR +# RUN git clone https://github.com/aurutils/aurutils.git /aur/aurutils && \ +RUN git clone https://aur.archlinux.org/aurutils.git /aur/aurutils + # cd /aur/aurutils && \ + # cd /aur/aurutils + # 2026-07-02 commenting out as switching git source to AUR instead of github + # git switch --detach $(curl -sSfL https://api.github.com/repos/aurutils/aurutils/releases/latest | jq -r .tag_name) # Ensure makepkg dirs exist @@ -61,9 +66,10 @@ RUN repo-add /repo/home.db.tar.zst && \ # Build the aurutils package -RUN makepkg --nosign -i --noconfirm -D /aur/aurutils/makepkg +RUN makepkg --nosign -i -s --noconfirm -D /aur/aurutils +# RUN makepkg --nosign -i --noconfirm -D /aur/aurutils/makepkg -RUN rm /repo/aurutils-git*.pkg.tar.zst && \ +RUN rm -f /repo/aurutils*.pkg.tar.zst && \ rm -r /aur/aurutils # Set working directory and entrypoint