From 2979ff0303cac88e2f2251512f35b9b03f146d52 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Tue, 31 Jan 2017 08:33:17 -0800 Subject: [PATCH] reformat tags before digests Signed-off-by: Riyaz Faizullabhoy --- Dockerfile.media | 3 +-- Makefile | 3 +-- alpine/Dockerfile | 3 +-- alpine/Makefile | 18 ++++++------------ alpine/cloud/Dockerfile.ami | 3 +-- alpine/cloud/Dockerfile.raw2vhd | 3 +-- alpine/containers/binfmt/Makefile | 6 ++---- alpine/containers/rng-tools/Makefile | 6 ++---- alpine/kernel/Dockerfile | 3 +-- alpine/kernel/Dockerfile.4.4 | 3 +-- alpine/kernel/Dockerfile.aufs | 3 +-- alpine/kernel/Makefile | 3 +-- alpine/packages/9pmount-vsock/Makefile | 3 +-- alpine/packages/containerd/Makefile | 6 ++---- alpine/packages/diagnostics/Makefile | 3 +-- alpine/packages/nc-vsock/Makefile | 3 +-- alpine/packages/proxy/Makefile | 3 +-- alpine/packages/tap-vsockd/Makefile | 3 +-- alpine/packages/transfused/Makefile | 3 +-- alpine/packages/vsudd/Makefile | 3 +-- alpine/test/Makefile | 6 ++---- base/binfmt/Makefile | 9 +++------ base/mkimage-gce/Dockerfile | 3 +-- base/rngd/Makefile | 9 +++------ base/test/Makefile | 9 +++------ base/test/bin/test.sh | 4 ++-- base/toybox-media/Makefile | 3 +-- 27 files changed, 43 insertions(+), 84 deletions(-) diff --git a/Dockerfile.media b/Dockerfile.media index 73a4446f1..65a745f55 100644 --- a/Dockerfile.media +++ b/Dockerfile.media @@ -1,5 +1,4 @@ -# Tag: 0a26fe5f574e444849983f9c4148ef74b3804d55 -FROM mobylinux/toybox-media@sha256:5ac38f77b66deb194c9016591b9b096e81fcdc9f7c3e6d01566294a6b4b4ebd2 +FROM mobylinux/toybox-media:0a26fe5f574e444849983f9c4148ef74b3804d55@sha256:5ac38f77b66deb194c9016591b9b096e81fcdc9f7c3e6d01566294a6b4b4ebd2 ADD \ alpine/initrd.img \ diff --git a/Makefile b/Makefile index 838f2b4a2..5b01df732 100644 --- a/Makefile +++ b/Makefile @@ -19,8 +19,7 @@ alpine/mobylinux-bios.iso: alpine/gce.img.tar.gz: $(MAKE) -C alpine gce.img.tar.gz -# Tag: 0fb8c648e8ed9ef6b1ec449587aeab6c53872744 -QEMU_IMAGE=mobylinux/qemu@sha256:606f30d815102e73bc01c07915dc0d5f153b0252c63f5f0ed1e39621ec656eb5 +QEMU_IMAGE=mobylinux/qemu:0fb8c648e8ed9ef6b1ec449587aeab6c53872744@sha256:606f30d815102e73bc01c07915dc0d5f153b0252c63f5f0ed1e39621ec656eb5 # interactive versions need to use volume mounts qemu: alpine/initrd.img alpine/kernel/x86_64/vmlinuz64 diff --git a/alpine/Dockerfile b/alpine/Dockerfile index f9a9d1e8d..439957b0f 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,5 +1,4 @@ -# Tag: 5837a236153f00bb215642e3e0639252eb49cdf9 -FROM mobylinux/alpine-base@sha256:f6f12aebe2af07c9250014ff283485dbdf082bd9cfbd74aad27a3d2dcf13e0b1 +FROM mobylinux/alpine-base:5837a236153f00bb215642e3e0639252eb49cdf9@sha256:f6f12aebe2af07c9250014ff283485dbdf082bd9cfbd74aad27a3d2dcf13e0b1 ENV ARCH=x86_64 diff --git a/alpine/Makefile b/alpine/Makefile index 2ad5d7b1d..f35f1a42f 100644 --- a/alpine/Makefile +++ b/alpine/Makefile @@ -13,23 +13,17 @@ endif # By default we want to always auth to GCE to upload moby images FORCE_GSUTIL_AUTH ?= 1 -# Tag: 2a860edda12a44c8e141a924f29ea931dbc01110 -BIOS_IMAGE=mobylinux/mkimage-iso-bios@sha256:974304cfff80524a37bf96d299de9b3163ba07df5feeb620c6bdcd132b46f16d +BIOS_IMAGE=mobylinux/mkimage-iso-bios:2a860edda12a44c8e141a924f29ea931dbc01110@sha256:974304cfff80524a37bf96d299de9b3163ba07df5feeb620c6bdcd132b46f16d -# Tag: f81034d118744a42e8e93cfe0777dc3490c1f6a0 -EFI_IMAGE=mobylinux/mkimage-iso-efi@sha256:4bb10d794fd0fe58366c36ab0fabf7b6d22e5bd760a994900da3b910230519cc +EFI_IMAGE=mobylinux/mkimage-iso-efi:f81034d118744a42e8e93cfe0777dc3490c1f6a0@sha256:4bb10d794fd0fe58366c36ab0fabf7b6d22e5bd760a994900da3b910230519cc -# Tag: 1edffcbfa13d4795f006d38e871a778ffba03d8a -PAD4_IMAGE=mobylinux/pad4@sha256:1ad26970698670373ee0bf374a06900f712a61b8038255e78271b840a1267b25 +PAD4_IMAGE=mobylinux/pad4:1edffcbfa13d4795f006d38e871a778ffba03d8a@sha256:1ad26970698670373ee0bf374a06900f712a61b8038255e78271b840a1267b25 -# Tag: d5711601eb5b89de0f052d87365e18388ff3f1b5 -TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:58d377e65845f91400e173ce9fca93462f2f237947eef2b0d2c17bb4f2da5ee8 +TAR2INITRD_IMAGE=mobylinux/tar2initrd:d5711601eb5b89de0f052d87365e18388ff3f1b5@sha256:58d377e65845f91400e173ce9fca93462f2f237947eef2b0d2c17bb4f2da5ee8 -# Tag: d56cde1558e3080e59a32e3cd7c7141baa601811 -TARTAR2INITRD_IMAGE=mobylinux/tartar2initrd@sha256:e1ad4522ff906d339da5f250b9ef6bffa5a70b4dec7d2cf7f7dbd0447b79352f +TARTAR2INITRD_IMAGE=mobylinux/tartar2initrd:d56cde1558e3080e59a32e3cd7c7141baa601811@sha256:e1ad4522ff906d339da5f250b9ef6bffa5a70b4dec7d2cf7f7dbd0447b79352f -# Tag: 83158ebe303a970a3131c3d02ef2ba00ca5e4a14 -GCE_IMAGE=mobylinux/mkimage-gce@sha256:51c30fbf946ca9967688a411e7bf69769a22987cd47ad03428491dd1556fcf63 +GCE_IMAGE=mobylinux/mkimage-gce:83158ebe303a970a3131c3d02ef2ba00ca5e4a14@sha256:51c30fbf946ca9967688a411e7bf69769a22987cd47ad03428491dd1556fcf63 moby.img: Dockerfile mkinitrd.sh init $(ETCFILES) $(MAKE) -j -C packages diff --git a/alpine/cloud/Dockerfile.ami b/alpine/cloud/Dockerfile.ami index a151d1a03..8067cd464 100644 --- a/alpine/cloud/Dockerfile.ami +++ b/alpine/cloud/Dockerfile.ami @@ -1,5 +1,4 @@ -# Tag: da39a3ee5e6b4b0d3255bfef95601890afd80709 -FROM mobylinux/alpine-aws@sha256:70799a47473700b5000557f07c0c2b6d293b017a5388c21dd5abe94f6b878632 +FROM mobylinux/alpine-aws:da39a3ee5e6b4b0d3255bfef95601890afd80709:@sha256:70799a47473700b5000557f07c0c2b6d293b017a5388c21dd5abe94f6b878632 RUN mkdir /build RUN mkdir /scripts diff --git a/alpine/cloud/Dockerfile.raw2vhd b/alpine/cloud/Dockerfile.raw2vhd index 182cef238..d058f620d 100644 --- a/alpine/cloud/Dockerfile.raw2vhd +++ b/alpine/cloud/Dockerfile.raw2vhd @@ -1,5 +1,4 @@ -# Tag: 97cc67f5569c437175f2e54b3c3b9a96a8615a16 -FROM mobylinux/alpine-qemu@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66 +FROM mobylinux/alpine-qemu:97cc67f5569c437175f2e54b3c3b9a96a8615a16@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66 COPY ./cloud/azure/raw2vhd.sh /raw2vhd.sh diff --git a/alpine/containers/binfmt/Makefile b/alpine/containers/binfmt/Makefile index e7cd984b3..60993e346 100644 --- a/alpine/containers/binfmt/Makefile +++ b/alpine/containers/binfmt/Makefile @@ -1,8 +1,6 @@ -# Tag: 893c93bf54bc037f6952886330d5ba58746ace37 -RIDDLER=mobylinux/riddler@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc +RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc -# Tag: e8e8e984e296148f1339c6cf335f55af2b9541a2 -BINFMT_IMAGE=mobylinux/binfmt@sha256:0c46639794bd6acaa71282dca282d8c113b1a7310b06be02cd850c07116c7d15 +BINFMT_IMAGE=mobylinux/binfmt:e8e8e984e296148f1339c6cf335f55af2b9541a2@sha256:0c46639794bd6acaa71282dca282d8c113b1a7310b06be02cd850c07116c7d15 default: container.tar diff --git a/alpine/containers/rng-tools/Makefile b/alpine/containers/rng-tools/Makefile index 62a99295d..bbd9a9071 100644 --- a/alpine/containers/rng-tools/Makefile +++ b/alpine/containers/rng-tools/Makefile @@ -1,8 +1,6 @@ -# Tag: 893c93bf54bc037f6952886330d5ba58746ace37 -RIDDLER=mobylinux/riddler@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc +RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc -# Tag: 3dad6dd43270fa632ac031e99d1947f20b22eec9 -RNGD_IMAGE=mobylinux/rngd@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92 +RNGD_IMAGE=mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92 default: container.tar diff --git a/alpine/kernel/Dockerfile b/alpine/kernel/Dockerfile index 03805eaf5..330d3ca34 100644 --- a/alpine/kernel/Dockerfile +++ b/alpine/kernel/Dockerfile @@ -1,5 +1,4 @@ -# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 -FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c +FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c ARG KERNEL_VERSION=4.9.6 diff --git a/alpine/kernel/Dockerfile.4.4 b/alpine/kernel/Dockerfile.4.4 index e2f91f5d1..c92ea6174 100644 --- a/alpine/kernel/Dockerfile.4.4 +++ b/alpine/kernel/Dockerfile.4.4 @@ -1,5 +1,4 @@ -# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 -FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c +FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c ARG KERNEL_VERSION=4.4.45 diff --git a/alpine/kernel/Dockerfile.aufs b/alpine/kernel/Dockerfile.aufs index 5cca69998..e3ecc851a 100644 --- a/alpine/kernel/Dockerfile.aufs +++ b/alpine/kernel/Dockerfile.aufs @@ -1,5 +1,4 @@ -# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 -FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c +FROM mobylinux/alpine-build-c:b77cfc4ad0033d4366df830ed697afc7bab458a2@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c ARG KERNEL_VERSION=4.9.6 diff --git a/alpine/kernel/Makefile b/alpine/kernel/Makefile index d799638d8..1af43509f 100644 --- a/alpine/kernel/Makefile +++ b/alpine/kernel/Makefile @@ -1,7 +1,6 @@ DEBUG ?= 0 -# Tag: d5711601eb5b89de0f052d87365e18388ff3f1b5 -TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:58d377e65845f91400e173ce9fca93462f2f237947eef2b0d2c17bb4f2da5ee8 +TAR2INITRD_IMAGE=mobylinux/tar2initrd:d5711601eb5b89de0f052d87365e18388ff3f1b5@sha256:58d377e65845f91400e173ce9fca93462f2f237947eef2b0d2c17bb4f2da5ee8 all: x86_64/vmlinuz64 diff --git a/alpine/packages/9pmount-vsock/Makefile b/alpine/packages/9pmount-vsock/Makefile index f9da87c8b..690461cdc 100644 --- a/alpine/packages/9pmount-vsock/Makefile +++ b/alpine/packages/9pmount-vsock/Makefile @@ -1,5 +1,4 @@ -# Tag: ac075fed7c87e4af30d8490ae0504166cceb0df3 -C_COMPILE=mobylinux/c-compile@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f +C_COMPILE=mobylinux/c-compile:ac075fed7c87e4af30d8490ae0504166cceb0df3@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f default: sbin/9pmount-vsock diff --git a/alpine/packages/containerd/Makefile b/alpine/packages/containerd/Makefile index 6887ff339..25baf70a5 100644 --- a/alpine/packages/containerd/Makefile +++ b/alpine/packages/containerd/Makefile @@ -1,9 +1,7 @@ -# Tag: cd9f1788bb2e8e7a342f32dd8ba70f450ff7ae2c -CONTAINERD_IMAGE=mobylinux/containerd@sha256:96a96f60751a1bb762e285f36e0cf9c5b4126933bb91475b7369efc990539165 +CONTAINERD_IMAGE=mobylinux/containerd:cd9f1788bb2e8e7a342f32dd8ba70f450ff7ae2c@sha256:96a96f60751a1bb762e285f36e0cf9c5b4126933bb91475b7369efc990539165 CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr -# Tag: 1a72d872ae97b90ae52482e4cb33a2778e168358 -RUNC_IMAGE=mobylinux/runc@sha256:2ea83d68baa57d547ec6d407d09cd495e4ef9cd6b0207ec3525fb2752b4a197e +RUNC_IMAGE=mobylinux/runc:1a72d872ae97b90ae52482e4cb33a2778e168358@sha256:2ea83d68baa57d547ec6d407d09cd495e4ef9cd6b0207ec3525fb2752b4a197e RUNC_BINARY=usr/bin/runc default: $(RUNC_BINARY) $(CONTAINERD_BINARIES) diff --git a/alpine/packages/diagnostics/Makefile b/alpine/packages/diagnostics/Makefile index b72c35b2e..6424768d6 100644 --- a/alpine/packages/diagnostics/Makefile +++ b/alpine/packages/diagnostics/Makefile @@ -1,5 +1,4 @@ -# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90 -GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 +GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 default: usr/bin/diagnostics-server diff --git a/alpine/packages/nc-vsock/Makefile b/alpine/packages/nc-vsock/Makefile index daae6c230..9c709af8b 100644 --- a/alpine/packages/nc-vsock/Makefile +++ b/alpine/packages/nc-vsock/Makefile @@ -1,5 +1,4 @@ -# Tag: ac075fed7c87e4af30d8490ae0504166cceb0df3 -C_COMPILE=mobylinux/c-compile@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f +C_COMPILE=mobylinux/c-compile:ac075fed7c87e4af30d8490ae0504166cceb0df3@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f default: usr/bin/nc-vsock diff --git a/alpine/packages/proxy/Makefile b/alpine/packages/proxy/Makefile index c8c8f2f3b..3d2771399 100644 --- a/alpine/packages/proxy/Makefile +++ b/alpine/packages/proxy/Makefile @@ -1,5 +1,4 @@ -# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90 -GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 +GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 all: usr/bin/slirp-proxy sbin/proxy-vsockd diff --git a/alpine/packages/tap-vsockd/Makefile b/alpine/packages/tap-vsockd/Makefile index 7f4194dc6..d6bdf6f7f 100644 --- a/alpine/packages/tap-vsockd/Makefile +++ b/alpine/packages/tap-vsockd/Makefile @@ -1,5 +1,4 @@ -# Tag: ac075fed7c87e4af30d8490ae0504166cceb0df3 -C_COMPILE=mobylinux/c-compile@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f +C_COMPILE=mobylinux/c-compile:ac075fed7c87e4af30d8490ae0504166cceb0df3@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f default: sbin/tap-vsockd diff --git a/alpine/packages/transfused/Makefile b/alpine/packages/transfused/Makefile index 5ce360895..ec87bea95 100644 --- a/alpine/packages/transfused/Makefile +++ b/alpine/packages/transfused/Makefile @@ -1,5 +1,4 @@ -# Tag: ac075fed7c87e4af30d8490ae0504166cceb0df3 -C_COMPILE=mobylinux/c-compile@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f +C_COMPILE=mobylinux/c-compile:ac075fed7c87e4af30d8490ae0504166cceb0df3@sha256:0e82d441ce112d638f904a08199c76b022c065a2dbf8908bb366755267d4417f default: sbin/transfused diff --git a/alpine/packages/vsudd/Makefile b/alpine/packages/vsudd/Makefile index 5bc12f087..0ee3373bf 100644 --- a/alpine/packages/vsudd/Makefile +++ b/alpine/packages/vsudd/Makefile @@ -1,5 +1,4 @@ -# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90 -GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 +GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 default: sbin/vsudd diff --git a/alpine/test/Makefile b/alpine/test/Makefile index 691db76f1..ab78f3803 100644 --- a/alpine/test/Makefile +++ b/alpine/test/Makefile @@ -1,8 +1,6 @@ -# Tag: 893c93bf54bc037f6952886330d5ba58746ace37 -RIDDLER=mobylinux/riddler@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc +RIDDLER=mobylinux/riddler:893c93bf54bc037f6952886330d5ba58746ace37@sha256:3d4a61555110be4b6e8ff6bcdcf5f8aa24d64564eb4162ea4e580d8916d083cc -# Tag: fc8e36cbd58b5e9078ae6aa57a348ca2fbec76dc -TEST_IMAGE=mobylinux/test@sha256:7155b16109270dc2d950f63279e5a682b2793b83bb26ff70c4783e6d723db5ba +TEST_IMAGE=mobylinux/test:fc8e36cbd58b5e9078ae6aa57a348ca2fbec76dc@sha256:7155b16109270dc2d950f63279e5a682b2793b83bb26ff70c4783e6d723db5ba default: container.tar diff --git a/base/binfmt/Makefile b/base/binfmt/Makefile index 94b73d0d3..5c445be66 100644 --- a/base/binfmt/Makefile +++ b/base/binfmt/Makefile @@ -1,15 +1,12 @@ -# Tag da39a3ee5e6b4b0d3255bfef95601890afd80709 -QEMU_IMAGE=mobylinux/qemu-user-static@sha256:6c022f700dc6c263c9107c08aa29b4eae3b43b7b7594b7be3e421f69b51f53e5 +QEMU_IMAGE=mobylinux/qemu-user-static:da39a3ee5e6b4b0d3255bfef95601890afd80709@sha256:6c022f700dc6c263c9107c08aa29b4eae3b43b7b7594b7be3e421f69b51f53e5 QEMU_FILES=qemu-arm qemu-aarch64 qemu-ppc64le QEMU_BINARIES=$(addprefix usr/bin/,$(QEMU_FILES)) -# Tag: 1ccd40acabb46f43593a960f5d3e0a42df53fb90 -GO_COMPILE=mobylinux/go-compile@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 +GO_COMPILE=mobylinux/go-compile:1ccd40acabb46f43593a960f5d3e0a42df53fb90@sha256:208c795a9b6572df09d9bf52ff3cfa97b9a07d109811ec9d28453a22c53f9d17 BINFMT_BINARY=usr/bin/binfmt -# Tag: alpine:3.5 -SHA_IMAGE=alpine@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 +SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 IMAGE=binfmt diff --git a/base/mkimage-gce/Dockerfile b/base/mkimage-gce/Dockerfile index be6c8349a..e3b266ee1 100644 --- a/base/mkimage-gce/Dockerfile +++ b/base/mkimage-gce/Dockerfile @@ -1,5 +1,4 @@ -# Tag: 8719f0f33b3cf9d59a62be64a42220978ac96486 -FROM mobylinux/guestfs@sha256:c7229f01c1a54270d2bc3597c30121628c18db211ed32fb7202823b6eaa4f853 +FROM mobylinux/guestfs:8719f0f33b3cf9d59a62be64a42220978ac96486@sha256:c7229f01c1a54270d2bc3597c30121628c18db211ed32fb7202823b6eaa4f853 COPY . . diff --git a/base/rngd/Makefile b/base/rngd/Makefile index b25e58bb9..d8e885624 100644 --- a/base/rngd/Makefile +++ b/base/rngd/Makefile @@ -1,9 +1,7 @@ -# Tag: b6aed437bad8f1f4471b11f1affe3420eaf5d42f -RNG_TOOLS_IMAGE=mobylinux/rng-tools@sha256:8e74e6a39b072ebee65ee4b83ebf224787afb473ea250c897dd24fa43b387d06 +RNG_TOOLS_IMAGE=mobylinux/rng-tools:b6aed437bad8f1f4471b11f1affe3420eaf5d42f@sha256:8e74e6a39b072ebee65ee4b83ebf224787afb473ea250c897dd24fa43b387d06 RNGD_BINARY=usr/sbin/rngd -# Tag 6b25b62f4d893de8721fd2581411039b17e8a253 -TINI_IMAGE=mobylinux/tini@sha256:39b4a459018ffc155a9fcbbf952fa625c77f5a8d7599b326eade529d3dc723fc +TINI_IMAGE=mobylinux/tini:6b25b62f4d893de8721fd2581411039b17e8a253@sha256:39b4a459018ffc155a9fcbbf952fa625c77f5a8d7599b326eade529d3dc723fc TINI_BINARY=bin/tini .PHONY: tag push clean container @@ -17,8 +15,7 @@ $(RNGD_BINARY): mkdir -p $(dir $@) docker run --rm --net=none $(RNG_TOOLS_IMAGE) tar cf - $@ | tar xf - -# Tag: alpine:3.5 -SHA_IMAGE=alpine@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 +SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 IMAGE=rngd diff --git a/base/test/Makefile b/base/test/Makefile index c69129d40..2568a4cc4 100644 --- a/base/test/Makefile +++ b/base/test/Makefile @@ -1,10 +1,8 @@ -# Tag b784b685b2c39b9bed4d58a989d06d8f0281b87c -MKSH_IMAGE=mobylinux/mksh@sha256:b3ca9febef294d002894b91e0ce0f794235db73a3024be3cae16d34022913de3 +MKSH_IMAGE=mobylinux/mksh:b784b685b2c39b9bed4d58a989d06d8f0281b87c@sha256:b3ca9febef294d002894b91e0ce0f794235db73a3024be3cae16d34022913de3 MKSH_BINARY=bin/mksh SH_BINARY=bin/sh -# Tag: e091a05fbf7c5e16f18b23602febd45dd690ba2f -CACERT_IMAGE=mobylinux/ca-certificates@sha256:a4e217ab2036bc128dc57a639a25fd285dbd68c47f9a46a91f1a9afab2bab3d3 +CACERT_IMAGE=mobylinux/ca-certificates:e091a05fbf7c5e16f18b23602febd45dd690ba2f@sha256:a4e217ab2036bc128dc57a639a25fd285dbd68c47f9a46a91f1a9afab2bab3d3 CACERT_FILE=etc/ssl/certs/ca-certificates.crt TEST_SCRIPT=bin/test.sh @@ -24,8 +22,7 @@ $(CACERT_FILE): mkdir -p $(dir $@) docker run --rm --net=none $(CACERT_IMAGE) tar cf - $@ | tar xf - -# Tag: alpine:3.5 -SHA_IMAGE=alpine@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 +SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8 IMAGE=test diff --git a/base/test/bin/test.sh b/base/test/bin/test.sh index 711c1ba47..0d238eb38 100755 --- a/base/test/bin/test.sh +++ b/base/test/bin/test.sh @@ -10,6 +10,6 @@ docker run --rm alpine true docker pull armhf/alpine docker run --rm armhf/alpine uname -a docker swarm init -docker run mobylinux/check-config@sha256:5dcdf0e3386ed506a28a59191eaa1ea48261e15199fcbbe8caf8dc1889405b2d -docker run mobylinux/check-kernel-config@sha256:6821a7bce30bd013a6cc190d171228f9b02359e9c792858005f401ab15357575 +docker run mobylinux/check-config:dc29b05bb5cca871f83421e4c4aaa8f5d3c682f4@sha256:5dcdf0e3386ed506a28a59191eaa1ea48261e15199fcbbe8caf8dc1889405b2d +docker run mobylinux/check-kernel-config:766a83e4b1831bef7f748071d0cd7715935d8be2@sha256:6821a7bce30bd013a6cc190d171228f9b02359e9c792858005f401ab15357575 cat /etc/moby diff --git a/base/toybox-media/Makefile b/base/toybox-media/Makefile index e66e3635c..a01a238fc 100644 --- a/base/toybox-media/Makefile +++ b/base/toybox-media/Makefile @@ -1,6 +1,5 @@ .PHONY: tag push -# Tag: bec336327b738df1e225bd845f416762a6b12dfc -BASE=mobylinux/alpine-build-toybox@sha256:54c813bcdd13c1108bb69ffdc9f3c0135db94625f1e57a885277717703bbf22b +BASE=mobylinux/alpine-build-toybox:bec336327b738df1e225bd845f416762a6b12dfc@sha256:54c813bcdd13c1108bb69ffdc9f3c0135db94625f1e57a885277717703bbf22b IMAGE=toybox-media default: push