Commit b2e07647 authored by Linux Ninja's avatar Linux Ninja
Browse files

add fakechroot dependency in README.md, prevent 'already exists' error when...


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: default avatarLinux Ninja <linuxninja@bryangay.com>
parent b274212c
...@@ -5,9 +5,8 @@ ADD archlinux.tar.xz / ...@@ -5,9 +5,8 @@ ADD archlinux.tar.xz /
RUN ldconfig && update-ca-trust && locale-gen RUN ldconfig && update-ca-trust && locale-gen
RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers ' 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. # initialize the archlinux keyring, but discard any private key that may be shipped.
RUN pacman-key --init && pacman-key --populate archlinux 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.}*
RUN rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pugring.gpg~,gnupg.S.}*
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD ["/usr/bin/bash"] CMD ["/usr/bin/bash"]
...@@ -6,7 +6,7 @@ PWD=$(shell pwd) ...@@ -6,7 +6,7 @@ PWD=$(shell pwd)
hooks: hooks:
mkdir -p alpm-hooks/usr/share/libalpm/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 rootfs: hooks
mkdir -vp $(BUILDDIR)/var/lib/pacman/ mkdir -vp $(BUILDDIR)/var/lib/pacman/
......
...@@ -5,6 +5,7 @@ Install the following Arch Linux packages: ...@@ -5,6 +5,7 @@ Install the following Arch Linux packages:
* make * make
* devtools * devtools
* docker * docker
* fakechroot
## Usage ## Usage
Run `make docker-image` as root to build the base image. Run `make docker-image` as root to build the base image.
## Purpose ## Purpose
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment