Merge branch 'master' into no-root-build

This commit is contained in:
Santiago Torres 2019-06-25 19:47:49 -04:00
commit b274212ca5
No known key found for this signature in database
GPG Key ID: 468F122CE8162295
2 changed files with 5 additions and 2 deletions

View File

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

View File

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