diff --git a/latest/Dockerfile b/latest/Dockerfile index 9cf5698..95b5261 100644 --- a/latest/Dockerfile +++ b/latest/Dockerfile @@ -9,19 +9,41 @@ RUN ln -s /usr/lib/libncursesw.so.6 /usr/lib/libncursesw.so.5 RUN pacman-db-upgrade > /dev/null RUN trust extract-compat -# Install yaourt -RUN pacman -Syu --noconfirm patch > /dev/null -COPY patches/pacman.conf.patch /tmp/pacman.conf.patch -RUN patch -u /etc/pacman.conf < /tmp/pacman.conf.patch && rm -f /tmp/pacman.conf.patch -RUN pacman -Syu yaourt --noconfirm > /dev/null # Add normal user who can escalate to root without a password -RUN pacman -Syu --noconfirm sudo > /dev/null +RUN pacman -Syu --noconfirm base-devel &> /dev/null COPY patches/sudoers.patch /tmp/sudoers.patch RUN patch -u /etc/sudoers < /tmp/sudoers.patch && rm -f /tmp/sudoers.patch RUN chown root:root /etc/sudoers && chmod 440 /etc/sudoers -RUN pacman -Syu --noconfirm util-linux &> /dev/null RUN useradd -m -d /home/user -s /bin/bash -g users -G users,wheel user +# INSTALL pacaur +## Install git +RUN pacman -Syu --noconfirm git > /dev/null +## Install cower +USER user +RUN curl -L -o /tmp/cower.tar.gz --silent https://aur.archlinux.org/cgit/aur.git/snapshot/cower.tar.gz && \ + tar -zxvf /tmp/cower.tar.gz -C /tmp/ > /dev/null && \ + cd /tmp/cower && \ + gpg --recv-keys --keyserver hkp://pgp.mit.edu 1EB2638FF56C0C53 2> /dev/null && \ + export PATH=/usr/bin/core_perl:$PATH && \ + makepkg -sri --noconfirm &> /dev/null && \ + rm -rf /tmp/cower* && \ + cd / +USER root +## Install expac +RUN pacman -Syu --noconfirm expac > /dev/null +# Install pacaur +USER user +RUN curl -L -o /tmp/pacaur.tar.gz --silent https://aur.archlinux.org/cgit/aur.git/snapshot/pacaur.tar.gz && \ + tar -zxvf /tmp/pacaur.tar.gz -C /tmp/ > /dev/null && \ + cd /tmp/pacaur && \ + export PATH=/usr/bin/core_perl:$PATH && \ + makepkg -sri --noconfirm &> /dev/null && \ + rm -rf /tmp/pacaur* && \ + cd / +USER root + + RUN pacman -Scc --noconfirm > /dev/null ONBUILD RUN pacman -Syu --noconfirm &> /dev/null diff --git a/latest/patches/pacman.conf.patch b/latest/patches/pacman.conf.patch deleted file mode 100644 index 4f50504..0000000 --- a/latest/patches/pacman.conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- pacman.conf.origin 2016-06-05 08:10:07.789022318 +0000 -+++ pacman.conf 2016-06-05 08:11:03.606533431 +0000 -@@ -98,3 +98,8 @@ - #[custom] - #SigLevel = Optional TrustAll - #Server = file:///home/custompkgs -+ -+[archlinuxfr] -+SigLevel = Never -+Server = http://repo.archlinux.fr/$arch -+