Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
archlinux-docker
Commits
592e77d8
Commit
592e77d8
authored
May 26, 2017
by
Pierre Schmitz
Browse files
Move image to archlinux organization on dockerhub
parent
d227b73c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
592e77d8
DOCKER_USER
:=
pierres
DOCKER_IMAGE
:=
archlinux
DOCKER_ORGANIZATION
=
archlinux
DOCKER_IMAGE
:=
base
rootfs
:
$(
eval
TMPDIR :
=
$(
shell
mktemp
-d
))
...
...
@@ -12,22 +13,22 @@ rootfs:
rm
-rf
$(TMPDIR)
docker-image
:
rootfs
docker build
-t
$(DOCKER_
USER
)
/
$(DOCKER_IMAGE)
.
docker build
-t
$(DOCKER_
ORGANIZATION
)
/
$(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 run
--rm
$(DOCKER_
ORGANIZATION
)
/
$(DOCKER_IMAGE)
sh
-c
"/usr/bin/pacman -Sy && /usr/bin/pacman -Qqk"
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
!
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
:
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'
docker-push
:
docker-image-test
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
exclude
View file @
592e77d8
...
...
@@ -5,7 +5,7 @@ etc/machine-id
etc/pacman.d/gnupg/openpgp-revocs.d/*
etc/pacman.d/gnupg/private-keys-v1.d/*
etc/pacman.d/gnupg/pubring.gpg~
etc/pacman.d/gnupg/S.
gpg-agent
*
etc/pacman.d/gnupg/S.*
root/*
tmp/*
var/cache/pacman/pkg/*
...
...
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