Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
hashworks
archlinux-docker
Commits
a4aeaa2e
Commit
a4aeaa2e
authored
Apr 23, 2017
by
Pierre Schmitz
Browse files
Use image variable for test as well
parent
a955274a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
a4aeaa2e
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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment