luzifer-docker/archlinux
2
0
Fork 0
mirror of https://github.com/luzifer-docker/archlinux.git synced 2024-12-29 23:21:15 +00:00
Code Issues Releases Wiki Activity

Move image to archlinux organization on dockerhub

Browse source
This commit is contained in:
Pierre Schmitz 2017-05-26 09:57:51 +02:00
parent d227b73c1a
commit 592e77d843
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Makefile
View file

@ -1,5 +1,6 @@
DOCKER_USER:=pierres DOCKER_USER:=pierres
DOCKER_IMAGE:=archlinux DOCKER_ORGANIZATION=archlinux
DOCKER_IMAGE:=base
rootfs: rootfs:
$(eval TMPDIR := $(shell mktemp -d)) $(eval TMPDIR := $(shell mktemp -d))
@ -12,22 +13,22 @@ rootfs:
rm -rf $(TMPDIR) rm -rf $(TMPDIR)
docker-image: rootfs docker-image: rootfs
docker build -t $(DOCKER_USER)/$(DOCKER_IMAGE) . docker build -t $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) .
docker-image-test: docker-image docker-image-test: docker-image
# FIXME: /etc/mtab is hidden by docker so the stricter -Qkk fails # 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_ORGANIZATION)/$(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 run --rm $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) sh -c "/usr/bin/pacman -Syu --noconfirm docker && docker -v"
# Ensure that the image does not include a private key # Ensure that the image does not include a private key
! docker run --rm $(DOCKER_USER)/$(DOCKER_IMAGE) pacman-key --lsign-key pierre@archlinux.de ! docker run --rm $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) pacman-key --lsign-key pierre@archlinux.de
ci-test: ci-test:
docker run --rm --privileged --tmpfs=/tmp:exec --tmpfs=/run/shm -v /run/docker.sock:/run/docker.sock \ docker run --rm --privileged --tmpfs=/tmp:exec --tmpfs=/run/shm -v /run/docker.sock:/run/docker.sock \
-v $(PWD):/app -w /app $(DOCKER_USER)/$(DOCKER_IMAGE) \ -v $(PWD):/app -w /app $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE) \
sh -c 'pacman -Syu --noconfirm make devtools docker && make docker-image-test' sh -c 'pacman -Syu --noconfirm make devtools docker && make docker-image-test'
docker-push: docker-image-test docker-push: docker-image-test
docker login -u $(DOCKER_USER) docker login -u $(DOCKER_USER)
docker push $(DOCKER_USER)/$(DOCKER_IMAGE) docker push $(DOCKER_ORGANIZATION)/$(DOCKER_IMAGE)
.PHONY: rootfs docker-image docker-image-test ci-test docker-push .PHONY: rootfs docker-image docker-image-test ci-test docker-push

2
exclude
View file

@ -5,7 +5,7 @@ etc/machine-id
etc/pacman.d/gnupg/openpgp-revocs.d/* etc/pacman.d/gnupg/openpgp-revocs.d/*
etc/pacman.d/gnupg/private-keys-v1.d/* etc/pacman.d/gnupg/private-keys-v1.d/*
etc/pacman.d/gnupg/pubring.gpg~ etc/pacman.d/gnupg/pubring.gpg~
etc/pacman.d/gnupg/S.gpg-agent* etc/pacman.d/gnupg/S.*
root/* root/*
tmp/* tmp/*
var/cache/pacman/pkg/* var/cache/pacman/pkg/*