Update base images to Alpine 3.5

excludes
- Go base images as not yet available
- perf which does not build with latest image

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-12-27 23:13:13 +00:00
parent ec870fc34d
commit 4ac42402e5
38 changed files with 68 additions and 69 deletions

View File

@ -1,5 +1,5 @@
# Tag: 67d704496949b92618501bdcf8a54aba3fe2489b
FROM mobylinux/toybox-media@sha256:09970e2207133fe205aa184776cea96bce92233f53d9018090c452d7fb301da1
# Tag: 0e76bc8d0bd0f0cd505d0353b3a550266c52133c
FROM mobylinux/toybox-media@sha256:69f9ae2e9192746f4f588d15ed15b9d8e005bbca394cfff1cfbbef023c4a7eed
ADD \
alpine/initrd.img \

View File

@ -1,5 +1,5 @@
# Tag: 804b2c40d078287c40aeb9166e475e843544e597
FROM mobylinux/alpine-qemu@sha256:aaecc961a62b14ee0ecd3a4fe792af5232637f0a49f7d0f90b87acaeb6f3fa4a
# Tag: 97cc67f5569c437175f2e54b3c3b9a96a8615a16
FROM mobylinux/alpine-qemu@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66
COPY alpine/initrd.img .
COPY alpine/kernel/x86_64/vmlinuz64 .

View File

@ -1,5 +1,5 @@
# Tag: 804b2c40d078287c40aeb9166e475e843544e597
FROM mobylinux/alpine-qemu@sha256:aaecc961a62b14ee0ecd3a4fe792af5232637f0a49f7d0f90b87acaeb6f3fa4a
# Tag: 97cc67f5569c437175f2e54b3c3b9a96a8615a16
FROM mobylinux/alpine-qemu@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66
COPY alpine/gce.img.tar.gz .
RUN zcat gce.img.tar.gz | tar xf -

View File

@ -1,5 +1,5 @@
# Tag: 804b2c40d078287c40aeb9166e475e843544e597
FROM mobylinux/alpine-qemu@sha256:aaecc961a62b14ee0ecd3a4fe792af5232637f0a49f7d0f90b87acaeb6f3fa4a
# Tag: 97cc67f5569c437175f2e54b3c3b9a96a8615a16
FROM mobylinux/alpine-qemu@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66
COPY alpine/mobylinux-bios.iso .

View File

@ -1,5 +1,5 @@
# Tag: 804b2c40d078287c40aeb9166e475e843544e597
FROM mobylinux/alpine-qemu@sha256:aaecc961a62b14ee0ecd3a4fe792af5232637f0a49f7d0f90b87acaeb6f3fa4a
# Tag: 97cc67f5569c437175f2e54b3c3b9a96a8615a16
FROM mobylinux/alpine-qemu@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66
COPY alpine/initrd-test.img initrd.img
COPY alpine/kernel/x86_64/vmlinuz64 .

View File

@ -1,6 +1,6 @@
# Create a EFI Bootable ISO
# Tag: 41ce281ca20186b8f5cae3b0fd05260189d6a3d2
FROM mobylinux/alpine-efi@sha256:15f82d91a6eb7ddd26bf6fe861787dd04073b4b5d3453a00d1052b0e4b972722
# Tag: cb55eabd696f41c5e4983a7440a865685087f683
FROM mobylinux/alpine-efi@sha256:3693e786f48858c1b104e64727ac487e3c851046755b241f8a4556afac97edd6
WORKDIR /tmp/efi

View File

@ -13,11 +13,11 @@ endif
# Tag: 22b043cb43f6bc3bc4e1f1ecf9d64932f9325642
BIOS_IMAGE=mobylinux/mkimage-iso-bios@sha256:7e28f7745fd62284142dce59a137c3331f7673efe8b3f19ee5c65e4cc27ff18c
# Tag: 95d4fef1a9555b640b4f94a4a3968533714059fe
PAD4_IMAGE=mobylinux/pad4@sha256:a26e02f16bdafa241a55e05fa09b9bb260e69a3a8c90418bb40b4ae936437d17
# Tag: c6c904f82ec47594f7b1a26a76013cd7a53356d8
PAD4_IMAGE=mobylinux/pad4@sha256:0963843b484faa021dc99f67bdfd01c9c1721621fffcf343a68151ae074b2206
# Tag: 74b6ce93033430a58826d90b0b88513e0dcfcb5a
TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:42e242f5bf8dc7971c1f0e6e7b156008d930d5b3129136e72c4b867f2ff15e98
# Tag: 1e3cdc45eae37806b692432e010271b3172b7f0a
TAR2INITRD_IMAGE=mobylinux/tar2initrd@sha256:4045cba0df947e449a54d3822f789dc3faad4aa8f04a0d51674ed777f044e159
# Tag: 77bc577875fb3a80ac2d14b70d1daa885bbf199c
GCE_IMAGE=mobylinux/mkimage-gce@sha256:f9abf2eae20984b7dd3c1afb700b2c9c41e39e6e7c688c78348a51d0780d74cc

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.5
RUN \
apk update && apk upgrade && \
@ -6,9 +6,8 @@ RUN \
curl \
e2fsprogs \
jq \
python \
py-pip \
python3 \
syslinux \
&& true
RUN pip install -U awscli
RUN pip3 install -U awscli

View File

@ -1,6 +1,6 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=alpine-aws
default: push

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.5
RUN \
apk update && apk upgrade && \
apk add \

View File

@ -1,6 +1,6 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=alpine-build-c
default: push

View File

@ -1,5 +1,5 @@
# Tag: 36aecb5cf4738737634140eec9abebe1f6559a39
FROM mobylinux/alpine-build-c@sha256:d66b9625abc831f28f8c584991a9cb6975e85d3bb3d3768474b592f1cf32a3a6
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . .
# 0.7.2
ENV LDFLAGS=--static

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.5
RUN \
apk update && apk upgrade && \

View File

@ -1,6 +1,6 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=alpine-efi
default: push

View File

@ -1,11 +1,9 @@
FROM alpine:3.4
COPY repositories /etc/apk/
FROM alpine:3.5
RUN \
apk update && apk upgrade && \
apk add --no-cache \
qemu-img@edge \
qemu-system-arm@edge \
qemu-system-x86_64@edge \
qemu-img \
qemu-system-arm \
qemu-system-x86_64 \
&& true

View File

@ -1,11 +1,11 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=alpine-qemu
default: push
hash: Dockerfile repositories
hash: Dockerfile
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --rm $(IMAGE):build sha1sum /lib/apk/db/installed | sed 's/ .*//' > hash

View File

@ -1,2 +0,0 @@
http://dl-cdn.alpinelinux.org/alpine/v3.4/main
@edge http://dl-cdn.alpinelinux.org/alpine/edge/main

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.5
RUN apk update && apk upgrade && apk add --no-cache bash
ADD https://raw.githubusercontent.com/docker/docker/master/contrib/check-config.sh /usr/bin/check-config.sh
ENTRYPOINT ["/bin/bash", "/usr/bin/check-config.sh"]

View File

@ -1,6 +1,6 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=check-config
default: push

View File

@ -1,5 +1,5 @@
# Tag: 9e9c6b252d2e4ec03da23c8f48f54fce7ddee8d3
FROM mobylinux/alpine-build-c@sha256:68737dcc6a1081f07aace1e82aefe90df399a25ae3a025664c4dbdccf76bbd97
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . /

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.5
COPY . /

View File

@ -1,6 +1,6 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=pad4
default: push

View File

@ -1,4 +1,4 @@
FROM alpine:3.4
FROM alpine:3.5
COPY . /

View File

@ -1,6 +1,6 @@
.PHONY: tag push
BASE=alpine:3.4
BASE=alpine:3.5
IMAGE=tar2initrd
default: push

View File

@ -1,6 +1,7 @@
# Tag: 7b94dce736818ca5c9d5367be360b79714687ca5
FROM mobylinux/alpine-build-c@sha256:9157aa25a781b5c47c563c0b9a5d564d41b32ceac9bf26d1e1249e8849d62c8b
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . /
ENV TINI_VERSION=0.13.0
ADD https://github.com/krallin/tini/archive/v${TINI_VERSION}.tar.gz tini-${TINI_VERSION}.tar.gz
RUN zcat tini-${TINI_VERSION}.tar.gz | tar xvf -

View File

@ -1,7 +1,7 @@
.PHONY: tag push
# Tag: 0b3fe26d29b08f0f74ce68bc6273bbc6cfedef34
BASE=mobylinux/alpine-build-toybox@sha256:5300e0c76a236391131e068c0c40226d4979c9b396f60a1a97cfef4b554476e5
# Tag: c544d1d4e0a5dd6af3e867c0fa19a628dc128e0c
BASE=mobylinux/alpine-build-toybox@sha256:3ef02ab3d9edebd9676b0178d729503d32f92230ef53132c26221d25911431d1
IMAGE=toybox-media
default: push

View File

@ -1,4 +1,5 @@
FROM mobylinux/alpine-aws:9f937d52372fc1a8a75b57a305d81ca88c522f78
# Tag: da39a3ee5e6b4b0d3255bfef95601890afd80709
FROM mobylinux/alpine-aws@sha256:70799a47473700b5000557f07c0c2b6d293b017a5388c21dd5abe94f6b878632
RUN mkdir /build
RUN mkdir /scripts

View File

@ -1,4 +1,5 @@
FROM mobylinux/alpine-qemu:0e5f8a908e7976c3a6ab725b7267ab725e89c6ae
# Tag: 97cc67f5569c437175f2e54b3c3b9a96a8615a16
FROM mobylinux/alpine-qemu@sha256:80e17a465b332d774fd91b53c0bcb18ed0ea8a77c17bf8d8451c57a8ab8b4e66
COPY ./cloud/azure/raw2vhd.sh /raw2vhd.sh

View File

@ -1,4 +1,5 @@
FROM mobylinux/alpine-build-c:701eedf80c332bafcb8dd085b758702ed37dab0e
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
ENV pkgname=rng-tools pkgver=5

View File

@ -1,5 +1,5 @@
# Tag 7b94dce736818ca5c9d5367be360b79714687ca5
TINI_IMAGE=mobylinux/tini@sha256:5f697e501ce12af1c72fbdf5dd74299bcc8c4f58e6215a7c48627dc6e11d9a29
# Tag c530ee985d21d6c0ee495d03086fc408b8183466
TINI_IMAGE=mobylinux/tini@sha256:065d5a16baf022324ac5fb997908f3efa5cc21982b455e832aed1151eb636a2a
TINI_BINARY=tini
default: rootfs

View File

@ -1,5 +1,5 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
ARG KERNEL_VERSION=4.9

View File

@ -1,5 +1,5 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
ARG KERNEL_VERSION=4.9

View File

@ -1,5 +1,5 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . /9pmount-vsock

View File

@ -1,5 +1,5 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . /nc-vsock

View File

@ -1,5 +1,5 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . /tap-vsockd

View File

@ -1,5 +1,5 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c
COPY . /transfused

View File

@ -1,5 +1,5 @@
# Tag dd4754bf8bc8b4af00210e688f233c869ddaa909
MKSH_IMAGE=mobylinux/mksh@sha256:dd73f387248377af1f900b33eb3422eef093e57f31cdaabad3017fcfb42ef65b
# Tag 48a34c44de78a7607b8b03e54efffc8ede461342
MKSH_IMAGE=mobylinux/mksh@sha256:b9ca6f8ec3d7855db91162555128429030e0ebc950881c1f09015c40d9e875d2
MKSH_FILE=mksh
MKSH_PATH=/bin

View File

@ -10,4 +10,4 @@ docker run --rm alpine true
docker pull armhf/alpine
docker run --rm armhf/alpine uname -a
docker swarm init
docker run mobylinux/check-config:bc2b57a0770129c75a6676ae0c944ece1d50cc3f
docker run mobylinux/check-config@sha256:7f8327e9eeae67a7f1388ad0ac5089454fea0636c175feb4400e5fc76ebc816e