diff --git a/Dockerfile b/Dockerfile index e071867..65f92c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,9 +5,8 @@ ADD archlinux.tar.xz / RUN ldconfig && update-ca-trust && locale-gen RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers ' -# initialize the archilnux keyring, but discard any private key that may be shipped. -RUN pacman-key --init && pacman-key --populate archlinux -RUN rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pugring.gpg~,gnupg.S.}* +# initialize the archlinux keyring, but discard any private key that may be shipped. +RUN pacman-key --init && pacman-key --populate archlinux && rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}* ENV LANG=en_US.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Makefile b/Makefile index 4cfd2ee..22a7c25 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ PWD=$(shell pwd) hooks: mkdir -p alpm-hooks/usr/share/libalpm/hooks - find /usr/share/libalpm/hooks -exec ln -s /dev/null $(PWD)/alpm-hooks{} \; + find /usr/share/libalpm/hooks -exec ln -sf /dev/null $(PWD)/alpm-hooks{} \; rootfs: hooks mkdir -vp $(BUILDDIR)/var/lib/pacman/ diff --git a/README.md b/README.md index 4dfbc53..d319da5 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ Install the following Arch Linux packages: * make * devtools * docker +* fakechroot ## Usage Run `make docker-image` as root to build the base image. ## Purpose