github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

pkg: Remove c-compile from init

Browse Source 
There is no need for start-stop-daemon since this package
is using containerd. Remove it and update the init
package to alpine:edge

Also use the git tree hash for the package hash while at it.

Signed-off-by: Rolf Neugebauer <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-05-05 16:47:03 +01:00
parent 41b7861bac
commit 662ed3ad1f
3 changed files with 13 additions and 1095 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/init/Dockerfile
View File

@ -1,9 +1,6 @@
FROM alpine:3.5 # Use sha256 here to get a fixed version
FROM alpine:edge@sha256:99588bc8883c955c157d18fc3eaa4a3c1400c223e6c7cabca5f600a3e9f8d5cd
RUN \ ENTRYPOINT []
apk --no-cache update && \ CMD []
apk --no-cache upgrade -a && \ WORKDIR /
apk --no-cache add \
&& rm -rf /var/cache/apk/*
COPY . ./ COPY . ./

41
pkg/init/Makefile
View File

@ -1,39 +1,14 @@
C_COMPILE=linuxkit/c-compile:63b085bbaec1aa7c42a7bd22a4b1c350d900617d .PHONY: tag push
START_STOP_DAEMON=sbin/start-stop-daemon
default: push default: push
$(START_STOP_DAEMON): start-stop-daemon.c
mkdir -p $(dir $@)
DOCKER_CONTENT_TRUST=1 docker pull $(C_COMPILE)
tar cf - $^ | DOCKER_CONTENT_TRUST=1 docker run --rm --net=none --log-driver=none -i $(C_COMPILE) -o $@ | tar xf -
.PHONY: tag push
BASE=alpine:3.5
IMAGE=init IMAGE=init
DEPS=Dockerfile init $(wildcard etc/*) $(wildcard etc/init.d/*)
ETC=$(shell find etc -type f) HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
hash: Dockerfile $(ETC) init $(START_STOP_DAEMON) tag: $(DEPS)
DOCKER_CONTENT_TRUST=1 docker pull $(BASE) docker build --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) .
tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
docker run --rm $(IMAGE):build sh -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@
push: hash push: tag
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \ docker pull linuxkit/$(IMAGE):$(HASH) || \
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash) && \ docker push linuxkit/$(IMAGE):$(HASH)
docker push linuxkit/$(IMAGE):$(shell cat hash))
docker rmi $(IMAGE):build
rm -f hash
tag: hash
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash)
docker rmi $(IMAGE):build
rm -f hash
clean:
rm -rf hash sbin usr
.DELETE_ON_ERROR:

1054
pkg/init/start-stop-daemon.c
View File

File diff suppressed because it is too large Load Diff