Verified Commit 3e3b44b6 authored by hashworks's avatar hashworks
Browse files

Move sysusers call back to Dockerfile

Resolves #52. Added small tests for user/group counts.
parent 65afb6ca
......@@ -151,6 +151,8 @@ image:publish:secure:
- tags
.test-script: &test-script
- test "$(cat /etc/group | wc -l)" -gt 10
- test "$(cat /etc/passwd | wc -l)" -gt 10
- pacman -Sy
- pacman -Qqk
- pacman -Syu --noconfirm docker grep
......
......@@ -22,6 +22,7 @@ FROM scratch AS root
COPY --from=verify /rootfs/ /
RUN ldconfig
RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers '
ENV LANG=en_US.UTF-8
CMD ["/usr/bin/bash"]
......@@ -19,7 +19,6 @@ define rootfs
fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust
fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen
fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers'
fakechroot -- fakeroot -- chroot $(BUILDDIR) sh -c 'pacman-key --init && pacman-key --populate archlinux && bash -c "rm -rf etc/pacman.d/gnupg/{openpgp-revocs.d/,private-keys-v1.d/,pubring.gpg~,gnupg.S.}*"'
ln -fs /usr/lib/os-release $(BUILDDIR)/etc/os-release
......
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