From f65025bafe9cb1dd1d4bd1546d3e0adc98619868 Mon Sep 17 00:00:00 2001 From: Santiago Torres Date: Mon, 4 Jun 2018 13:17:30 -0400 Subject: [PATCH] FIX:fix docker build commands I commited the wrong Dockerfile. --- Dockerfile | 8 ++++---- Makefile | 2 +- rootfs/etc/pacman.conf => pacman.conf | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename rootfs/etc/pacman.conf => pacman.conf (98%) diff --git a/Dockerfile b/Dockerfile index a09622b..c0060f6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM scratch ADD archlinux.tar / -RUN update-ca-certs -RUN locale-gen -RUN pacman-key --init && pacman-key --populate archlinux -RUN /usr/share/libalpm/scripts/systemd-hook sysusers + +# manually run all alpm hooks that can't be run inside the fakechroot +RUN ldconfig && update-ca-trust && locale-gen && /usr/share/libalpm/scripts/systemd-hook sysusers && pacman-key --init && pacman-key --populate archlinux + ENV LANG=en_US.UTF-8 CMD ["/usr/bin/bash"] diff --git a/Makefile b/Makefile index 3b83b24..8e47df6 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ rootfs: hooks mkdir -vp $(BUILDDIR)/var/lib/pacman/ fakechroot -- fakeroot -- pacman -Sy -r $(BUILDDIR) \ --noconfirm --dbpath $(PWD)/$(BUILDDIR)/var/lib/pacman \ - --config rootfs/etc/pacman.conf \ + --config pacman.conf \ --noscriptlet \ --hookdir $(PWD)/alpm-hooks/usr/share/libalpm/hooks/ $(shell cat packages) cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(BUILDDIR)/ diff --git a/rootfs/etc/pacman.conf b/pacman.conf similarity index 98% rename from rootfs/etc/pacman.conf rename to pacman.conf index 9f62156..4cf98ed 100644 --- a/rootfs/etc/pacman.conf +++ b/pacman.conf @@ -76,7 +76,7 @@ Include = rootfs/etc/pacman.d/mirrorlist Include = rootfs/etc/pacman.d/mirrorlist [community] -Include = rootfs//etc/pacman.d/mirrorlist +Include = rootfs/etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, # enable the multilib repositories as required here.