mirrors/archlinux-docker
1
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/archlinux-docker.git synced 2025-08-07 06:37:23 +02:00
Code Issues Projects Releases Wiki Activity

Move sysusers call back to Dockerfile

Browse Source 
Resolves #52. Added small tests for user/group counts.
This commit is contained in:
Justin Kromlinger 2020-12-09 23:32:23 +01:00
parent 65afb6ca64
commit 3e3b44b68c
No known key found for this signature in database
GPG Key ID: 69EF6D9E49A64EB8
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -151,6 +151,8 @@ image:publish:secure:
- tags - tags
.test-script: &test-script .test-script: &test-script
- test "$(cat /etc/group | wc -l)" -gt 10
- test "$(cat /etc/passwd | wc -l)" -gt 10
- pacman -Sy - pacman -Sy
- pacman -Qqk - pacman -Qqk
- pacman -Syu --noconfirm docker grep - pacman -Syu --noconfirm docker grep

1
Dockerfile.template
View File

@ -22,6 +22,7 @@ FROM scratch AS root
COPY --from=verify /rootfs/ / COPY --from=verify /rootfs/ /
RUN ldconfig RUN ldconfig
RUN sh -c 'ls usr/lib/sysusers.d/*.conf | /usr/share/libalpm/scripts/systemd-hook sysusers '
ENV LANG=en_US.UTF-8 ENV LANG=en_US.UTF-8
CMD ["/usr/bin/bash"] CMD ["/usr/bin/bash"]

1
Makefile
View File

@ -19,7 +19,6 @@ define rootfs
fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust fakechroot -- fakeroot -- chroot $(BUILDDIR) update-ca-trust
fakechroot -- fakeroot -- chroot $(BUILDDIR) locale-gen 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.}*"' 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 ln -fs /usr/lib/os-release $(BUILDDIR)/etc/os-release