Unverified Commit b274212c authored by Santiago Torres-Arias's avatar Santiago Torres-Arias
Browse files

Merge branch 'master' into no-root-build

parents cb1c8b8b 8ec2549c
FROM scratch FROM scratch
ADD archlinux.tar / ADD archlinux.tar.xz /
# manually run all alpm hooks that can't be run inside the fakechroot # manually run all alpm hooks that can't be run inside the fakechroot
RUN ldconfig && update-ca-trust && locale-gen RUN ldconfig && update-ca-trust && locale-gen
......
...@@ -19,7 +19,10 @@ rootfs: hooks ...@@ -19,7 +19,10 @@ rootfs: hooks
tar --numeric-owner --xattrs --acls --exclude-from=exclude -C $(BUILDDIR) -c . -f archlinux.tar tar --numeric-owner --xattrs --acls --exclude-from=exclude -C $(BUILDDIR) -c . -f archlinux.tar
rm -rf $(BUILDDIR) alpm-hooks 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 build -t $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) .
docker-image-test: docker-image docker-image-test: docker-image
......
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