github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-25 19:54:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #969 from justincormack/base-build-deps

Browse Source 
Simplify base images
This commit is contained in:
Justin Cormack 2017-01-09 17:48:00 +00:00 committed by GitHub
commit 473ef04bd9
5 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
alpine/base/mksh/Dockerfile
View File

@ -1,5 +1,13 @@
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 FROM alpine:3.5
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c RUN \
apk update && apk upgrade && \
apk add \
curl \
gcc \
groff \
make \
musl-dev \
&& true
COPY . / COPY . /

2
alpine/base/mksh/Makefile
View File

@ -1,10 +1,12 @@
.PHONY: tag push .PHONY: tag push
BASE=alpine:3.5
IMAGE=mksh IMAGE=mksh
default: push default: push
hash: Dockerfile hash: Dockerfile
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 /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash docker run --rm --entrypoint sh $(IMAGE):build -c 'cat /Dockerfile /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash

12
alpine/base/tini/Dockerfile
View File

@ -1,5 +1,13 @@
# Tag: b77cfc4ad0033d4366df830ed697afc7bab458a2 FROM alpine:3.5
FROM mobylinux/alpine-build-c@sha256:53739ea6042cb0ac39cf6e262012c1c4224206b2c9b719569fe7efa3a381348c RUN \
apk update && apk upgrade && \
apk add \
cmake \
gcc \
make \
musl-dev \
vim \
&& true
COPY . / COPY . /
ENV TINI_VERSION=0.13.0 ENV TINI_VERSION=0.13.0

2
alpine/base/tini/Makefile
View File

@ -1,10 +1,12 @@
.PHONY: tag push .PHONY: tag push
BASE=alpine:3.5
IMAGE=tini IMAGE=tini
default: push default: push
hash: Dockerfile hash: Dockerfile
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 /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash docker run --rm --entrypoint sh $(IMAGE):build -c 'cat /Dockerfile /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > hash

4
alpine/containers/rng-tools/Makefile
View File

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