diff --git a/Dockerfile b/Dockerfile index 5470c0b..02fbabc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,8 @@ RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hoo # update /etc/os-release RUN ln -s /usr/lib/os-release /etc/os-release -# 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 b1800c4..dfe2e9c 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,11 @@ DOCKER_IMAGE:=base BUILDDIR=build PWD=$(shell pwd) +XZ_THREADS ?= 0 + 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/ @@ -30,7 +32,7 @@ rootfs: hooks archlinux.tar: rootfs compress-rootfs: archlinux.tar - xz -f archlinux.tar + xz -9 -T"$(XZ_THREADS)" -f archlinux.tar docker-image: compress-rootfs docker build -t $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) . diff --git a/README.md b/README.md index 4dfbc53..8e80316 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,8 @@ Install the following Arch Linux packages: * make * devtools * docker +* fakechroot +* fakeroot ## Usage Run `make docker-image` as root to build the base image. ## Purpose