From b18d50b5e4f2842c3514e31bc30c4be302e82400 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Wed, 12 Apr 2017 12:05:35 +0200 Subject: [PATCH] miragesdk: rebase init pkg to catch up with upstream changes Signed-off-by: Thomas Gazagnaire --- projects/miragesdk/pkg/init/Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/projects/miragesdk/pkg/init/Makefile b/projects/miragesdk/pkg/init/Makefile index d5cf7127a..8b5f30eef 100644 --- a/projects/miragesdk/pkg/init/Makefile +++ b/projects/miragesdk/pkg/init/Makefile @@ -1,22 +1,8 @@ -CONTAINERD_IMAGE=mobylinux/containerd:a688df6aee1e3700eb8d54dbc81070361df397a2@sha256:59ee3da05fe4dad4fbecff582c86fc30ce75e19a225eeeb07e203c9cc36fe34f -CONTAINERD_BINARIES=usr/bin/containerd usr/bin/containerd-shim usr/bin/ctr usr/bin/dist - -RUNC_IMAGE=mobylinux/runc:f225fb93dc3e6dda1cc9004962893015b29dc2d6@sha256:e75c4b274236bd3ad9f4db0a91a6f2174c8c77009c361ab5dd7a4169406675bc -RUNC_BINARY=usr/bin/runc - C_COMPILE=mobylinux/c-compile:81a6bd8ff45d769b60a2ee1acdaccda11ab835c8@sha256:eac250997a3b9784d3285a03c0c8311d4ca6fb63dc75164c987411ba93006487 START_STOP_DAEMON=sbin/start-stop-daemon default: push -$(RUNC_BINARY): Makefile - mkdir -p $(dir $@) - docker run --rm --net=none $(RUNC_IMAGE) tar cf - $@ | tar xf - - -$(CONTAINERD_BINARIES): Makefile - mkdir -p $(dir $@) - docker run --rm --net=none $(CONTAINERD_IMAGE) tar cf - $@ | tar xf - - $(START_STOP_DAEMON): start-stop-daemon.c mkdir -p $(dir $@) tar cf - $^ | docker run --rm --net=none --log-driver=none -i $(C_COMPILE) -o $@ | tar xf - @@ -28,7 +14,7 @@ IMAGE=init ETC=$(shell find etc -type f) -hash: Dockerfile $(ETC) init $(RUNC_BINARY) $(CONTAINERD_BINARIES) $(START_STOP_DAEMON) +hash: Dockerfile $(ETC) init $(START_STOP_DAEMON) DOCKER_CONTENT_TRUST=1 docker pull $(BASE) tar cf - $^ | docker build --no-cache -t $(IMAGE):build - docker run --rm $(IMAGE):build sh -c 'cat $^ /lib/apk/db/installed | sha1sum' | sed 's/ .*//' > $@