github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-21 01:59:07 +00:00
Code Issues Projects Releases Wiki Activity

Clean up build to not use alpine-build-c where not needed

Browse Source 
Makes updates simpler.

Makes it explicit that `perf` currently requires Alpine 3.4, and update kernel version.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2017-01-15 11:30:20 +00:00
parent 6f07ca1a8f
commit 421afc5000
6 changed files with 40 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.media
View File

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

11
alpine/base/alpine-build-toybox/Dockerfile
View File

@ -1,5 +1,12 @@
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 FROM alpine:3.5
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c RUN \
apk update && apk upgrade && \
apk add \
automake \
bash \
build-base \
git \
&& true
COPY . . COPY . .
# 0.7.2 # 0.7.2
ENV LDFLAGS=--static ENV LDFLAGS=--static

2
alpine/base/alpine-build-toybox/Makefile
View File

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

24
alpine/base/perf/Dockerfile
View File

@ -1,7 +1,25 @@
# Tag: 3da0b0ea0da2724232603094e67c75b41adab551 FROM alpine:3.4
FROM mobylinux/alpine-build-c@sha256:0236d6599f6c8f7aa42829285e04202fbe99984df2818af0f5a453a59de8b090
ARG KERNEL_VERSION=4.8.14 RUN \
apk update && apk upgrade && \
apk add \
argp-standalone \
automake \
bc \
binutils-dev \
bison \
build-base \
curl \
flex \
libelf-dev \
linux-headers \
sed \
tar \
util-linux-dev \
xz \
&& true
ARG KERNEL_VERSION=4.9.3
# get kernel source and extract it under /linux # get kernel source and extract it under /linux
ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz

5
alpine/base/perf/Makefile
View File

@ -1,7 +1,10 @@
BASE=alpine:3.4
DEPS=Dockerfile DEPS=Dockerfile
bin/perf: $(DEPS) bin/perf: $(DEPS)
mkdir -p bin DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
mkdir -p $(dir $@)
BUILD=$$( docker build -q . ) && \ BUILD=$$( docker build -q . ) && \
docker run --rm --net=none $$BUILD | tar xf - -C bin docker run --rm --net=none $$BUILD | tar xf - -C bin

5
alpine/base/toybox-media/Makefile
View File

@ -1,7 +1,6 @@
.PHONY: tag push .PHONY: tag push
# Tag: bec336327b738df1e225bd845f416762a6b12dfc
# Tag: c544d1d4e0a5dd6af3e867c0fa19a628dc128e0c BASE=mobylinux/alpine-build-toybox@sha256:54c813bcdd13c1108bb69ffdc9f3c0135db94625f1e57a885277717703bbf22b
BASE=mobylinux/alpine-build-toybox@sha256:3ef02ab3d9edebd9676b0178d729503d32f92230ef53132c26221d25911431d1
IMAGE=toybox-media IMAGE=toybox-media
default: push default: push