mirrors/archlinux-docker
1
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/archlinux-docker.git synced 2026-05-04 21:36:18 +02:00
Code Issues Projects Releases Wiki Activity

FIX:fix docker build commands

Browse Source 
I commited the wrong Dockerfile.
This commit is contained in:
Santiago Torres 2018-06-04 13:17:30 -04:00
parent 602cda864e
commit f65025bafe
No known key found for this signature in database
GPG Key ID: 468F122CE8162295
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -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"]

2
Makefile
View File

@ -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)/

2
rootfs/etc/pacman.conf → pacman.conf
View File

@ -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.