diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2017-04-23 16:48:06 +0200 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2017-04-23 16:48:06 +0200 |
| commit | a4aeaa2eb29958d59cca7f6d15b658db584841f2 (patch) | |
| tree | bea586544e5624118f4e9eb4657553ae35861be1 | |
| parent | a955274a5563ae2dd54f0915703d8249504d2308 (diff) | |
Use image variable for test as well
| -rw-r--r-- | Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,5 @@ -DOCKER_USER := 'pierres' -DOCKER_IMAGE := 'archlinux' +DOCKER_USER:=pierres +DOCKER_IMAGE:=archlinux rootfs: $(eval TMPDIR := $(shell mktemp -d)) @@ -19,14 +19,15 @@ docker-image-test: docker-image 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" # Ensure that the image does not include a private key - ! docker run --rm pierres/archlinux pacman-key --lsign-key pierre@archlinux.de + ! docker run --rm $(DOCKER_USER)/$(DOCKER_IMAGE) pacman-key --lsign-key pierre@archlinux.de ci-test: - docker run --rm --privileged --tmpfs=/tmp:exec --tmpfs=/run/shm -v /var/run/docker.sock:/var/run/docker.sock -v $(PWD):/app -w /app pierres/archlinux \ + docker run --rm --privileged --tmpfs=/tmp:exec --tmpfs=/run/shm -v /var/run/docker.sock:/var/run/docker.sock \ + -v $(PWD):/app -w /app $(DOCKER_USER)/$(DOCKER_IMAGE) \ sh -c 'pacman -Syu --noconfirm make devtools docker && make docker-image-test' docker-push: docker-image-test docker login -u $(DOCKER_USER) docker push $(DOCKER_USER)/$(DOCKER_IMAGE) -.PHONY: rootfs docker-image docker-image-test docker-push +.PHONY: rootfs docker-image docker-image-test ci-test docker-push |