Merge pull request #983 from justincormack/no-latest

Remove some pushes to :latest
This commit is contained in:
Riyaz Faizullabhoy 2017-01-10 09:52:55 -08:00 committed by GitHub
commit d162d5ec53
5 changed files with 7 additions and 15 deletions

View File

@ -19,8 +19,8 @@ BIOS_IMAGE=mobylinux/mkimage-iso-bios@sha256:7e28f7745fd62284142dce59a137c3331f7
# Tag: c6c904f82ec47594f7b1a26a76013cd7a53356d8
PAD4_IMAGE=mobylinux/pad4@sha256:0963843b484faa021dc99f67bdfd01c9c1721621fffcf343a68151ae074b2206
# Tag: 1e3cdc45eae37806b692432e010271b3172b7f0a
TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:4045cba0df947e449a54d3822f789dc3faad4aa8f04a0d51674ed777f044e159
# Tag: 5bcb6d6154f03617405f9fed9346e8e607acfc75
TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:f9aa2508e6d53d4f7c9296ba273dea37960c544333ca2241d78dc1f8a5f6c963
# Tag: 77bc577875fb3a80ac2d14b70d1daa885bbf199c
GCE_IMAGE=mobylinux/mkimage-gce@sha256:f9abf2eae20984b7dd3c1afb700b2c9c41e39e6e7c688c78348a51d0780d74cc

View File

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

View File

@ -13,9 +13,7 @@ hash: Dockerfile check-kernel-config.sh
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash

View File

@ -13,9 +13,7 @@ hash: Dockerfile pad4.sh
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash

View File

@ -8,14 +8,12 @@ default: push
hash: Dockerfile tar2initrd.sh
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c 'cat Dockerfile pad4.sh /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash
docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c 'cat Dockerfile tar2initrd.sh /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash
push: hash
docker pull mobylinux/$(IMAGE):$(shell cat hash) || \
(docker tag $(IMAGE):build mobylinux/$(IMAGE):$(shell cat hash) && \
docker tag $(IMAGE):build mobylinux/$(IMAGE):latest && \
docker push mobylinux/$(IMAGE):$(shell cat hash) && \
docker push mobylinux/$(IMAGE):latest)
docker push mobylinux/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash