add fakechroot dependency in README.md, prevent 'already exists' error when running ln -s by adding -f in Makefile, combine two layers of Dockerfile and fix typo of pugring.gpg~

Signed-off-by: Linux Ninja <linuxninja@bryangay.com>
This commit is contained in:
Linux Ninja 2019-08-10 02:57:40 -04:00
parent b274212ca5
commit b2e07647e9
3 changed files with 4 additions and 4 deletions

View File

@ -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"]

View File

@ -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/

View File

@ -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