mirror of
https://gitlab.archlinux.org/archlinux/archlinux-docker.git
synced 2026-01-16 14:51:08 +01:00
Merge branch 'master' into no-root-build
This commit is contained in:
commit
b274212ca5
@ -1,5 +1,5 @@
|
||||
FROM scratch
|
||||
ADD archlinux.tar /
|
||||
ADD archlinux.tar.xz /
|
||||
|
||||
# manually run all alpm hooks that can't be run inside the fakechroot
|
||||
RUN ldconfig && update-ca-trust && locale-gen
|
||||
|
||||
5
Makefile
5
Makefile
@ -19,7 +19,10 @@ rootfs: hooks
|
||||
tar --numeric-owner --xattrs --acls --exclude-from=exclude -C $(BUILDDIR) -c . -f archlinux.tar
|
||||
rm -rf $(BUILDDIR) alpm-hooks
|
||||
|
||||
docker-image: rootfs
|
||||
compress-rootfs: rootfs
|
||||
xz archlinux.tar
|
||||
|
||||
docker-image: compress-rootfs
|
||||
docker build -t $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) .
|
||||
|
||||
docker-image-test: docker-image
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user