luzifer-docker/archlinux
2
0
Fork 0
mirror of https://github.com/luzifer-docker/archlinux.git synced 2024-11-08 15:30:09 +00:00
Code Issues Releases Wiki Activity

Fix permissions and add basic image test

Browse source
This commit is contained in:
Pierre Schmitz 2017-04-15 21:14:45 +02:00
parent fd90632ef2
commit 9a19fbb335
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Makefile
View file

@ -4,7 +4,7 @@ DOCKER_IMAGE := 'archlinux'
rootfs: rootfs:
$(eval TMPDIR := $(shell mktemp -d)) $(eval TMPDIR := $(shell mktemp -d))
pacstrap -C /usr/share/devtools/pacman-extra.conf -c -d -G -M $(TMPDIR) $(shell cat packages) pacstrap -C /usr/share/devtools/pacman-extra.conf -c -d -G -M $(TMPDIR) $(shell cat packages)
cp -rp --backup --suffix=.pacnew rootfs/* $(TMPDIR)/ cp --recursive --preserve=timestamps --backup --suffix=.pacnew rootfs/* $(TMPDIR)/
arch-chroot $(TMPDIR) locale-gen arch-chroot $(TMPDIR) locale-gen
arch-chroot $(TMPDIR) pacman-key --init arch-chroot $(TMPDIR) pacman-key --init
arch-chroot $(TMPDIR) pacman-key --populate archlinux arch-chroot $(TMPDIR) pacman-key --populate archlinux
@ -14,8 +14,13 @@ rootfs:
docker-image: rootfs docker-image: rootfs
docker build -t $(DOCKER_USER)/$(DOCKER_IMAGE) . docker build -t $(DOCKER_USER)/$(DOCKER_IMAGE) .
docker-push: docker-image docker-image-test: docker-image
# FIXME: /etc/mtab is hidden by docker so the stricter -Qkk fails
docker run --rm $(DOCKER_USER)/$(DOCKER_IMAGE) sh -c "/usr/bin/pacman -Sy && /usr/bin/pacman -Qqk"
docker run --rm $(DOCKER_USER)/$(DOCKER_IMAGE) sh -c "/usr/bin/pacman -Syu --noconfirm docker && docker -v"
docker-push: docker-image-test
docker login -u $(DOCKER_USER) docker login -u $(DOCKER_USER)
docker push $(DOCKER_USER)/$(DOCKER_IMAGE) docker push $(DOCKER_USER)/$(DOCKER_IMAGE)
.PHONY: rootfs docker-image docker-push .PHONY: rootfs docker-image docker-image-test docker-push