Do not create latest tags for base images

As we never use these, do not create them.

Also update images where applicable.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-10-10 14:55:48 +01:00
parent 007a4cab96
commit 0ac6beff82
15 changed files with 29 additions and 47 deletions

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-qemu:1f3de121e9dea39a198413344a72049839bea91b
FROM mobylinux/alpine-qemu:804b2c40d078287c40aeb9166e475e843544e597
COPY alpine/initrd.img .
COPY alpine/kernel/x86_64/vmlinuz64 .

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-qemu:1f3de121e9dea39a198413344a72049839bea91b
FROM mobylinux/alpine-qemu:804b2c40d078287c40aeb9166e475e843544e597
COPY alpine/mobylinux-bios.iso .

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-qemu:1f3de121e9dea39a198413344a72049839bea91b
FROM mobylinux/alpine-qemu:804b2c40d078287c40aeb9166e475e843544e597
COPY alpine/initrd.img .
COPY alpine/kernel/x86_64/vmlinuz64 .

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-base:550f9068f98000a9134b08217cde767fa732e6e0
FROM mobylinux/alpine-base:a789b97cc7b77b84fc341e1643b21b000823ee05
ENV ARCH=x86_64

View File

@ -42,7 +42,7 @@ mobylinux-efi.iso: Dockerfile.efi initrd.img kernel/x86_64/vmlinuz64
mobylinux-bios.iso: initrd.img kernel/x86_64/vmlinuz64
tar cf - initrd.img -C kernel/x86_64 vmlinuz64 | \
docker run --net=none --log-driver=none --rm -i mobylinux/alpine-bios:67236852ecf950af0486ac22b0963b404d16c348 >$@
docker run --net=none --log-driver=none --rm -i mobylinux/alpine-bios:e6cb3f313db7098a1cd21051e678b01931a037a0 >$@
common: initrd.img
$(MAKE) -C kernel

View File

@ -12,10 +12,8 @@ hash:
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker run $(IMAGE):build cat /lib/apk/db/installed | grep -E '^(P|V)' | \
awk '/^P/{printf substr($$1, 3),$$0;next} /^V/{print " " substr($$1, 3);next}' | sort > packages
docker rmi -f $(IMAGE):build
@ -23,8 +21,7 @@ push: hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash))
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker rmi -f $(IMAGE):build
rm -f hash

View File

@ -1,9 +1,9 @@
alpine-baselayout 3.0.3-r0
alpine-conf 3.4.1-r2
alpine-conf 3.4.1-r5
alpine-keys 1.1-r0
apk-tools 2.6.7-r0
bind-libs 9.10.4_p2-r0
bind-tools 9.10.4_p2-r0
bind-libs 9.10.4_p3-r0
bind-tools 9.10.4_p3-r0
busybox 1.24.2-r11
busybox-initscripts 3.0-r3
ca-certificates 20160104-r4

View File

@ -12,17 +12,14 @@ hash:
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash))
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash

View File

@ -12,17 +12,14 @@ hash:
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash))
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash

View File

@ -12,17 +12,14 @@ hash:
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash))
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash

View File

@ -12,17 +12,14 @@ hash:
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash))
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash

View File

@ -12,17 +12,14 @@ hash:
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash))
docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-build-go:21b413791b4fed2e16126c77c6b860feaf889d70
FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc
COPY ./ /go/src/diagnostics-server/

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-build-go:21b413791b4fed2e16126c77c6b860feaf889d70
FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc
COPY ./ /go/src/proxy/

View File

@ -1,4 +1,4 @@
FROM mobylinux/alpine-build-go:21b413791b4fed2e16126c77c6b860feaf889d70
FROM mobylinux/alpine-build-go:e3d97551827fd2ea70b8c484615e85986d4e77fc
COPY ./ /go/src/vsudd/