From c1a873b48907ac65271228e4ff77accd2e1669f7 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Thu, 18 May 2017 12:29:53 +0100 Subject: [PATCH] pkg: Update most packages to new alpine base Also make the HUB org/registry build time configurable for these packages. Others will be reworked in sub sequent commits. Signed-off-by: Rolf Neugebauer --- pkg/binfmt/Dockerfile | 2 +- pkg/binfmt/Makefile | 7 ++++--- pkg/ca-certificates/Dockerfile | 2 +- pkg/ca-certificates/Makefile | 5 +++-- pkg/containerd/Dockerfile | 2 +- pkg/containerd/Makefile | 5 +++-- pkg/rngd/Dockerfile | 2 +- pkg/rngd/Makefile | 7 ++++--- pkg/runc/Dockerfile | 2 +- pkg/runc/Makefile | 5 +++-- 10 files changed, 22 insertions(+), 17 deletions(-) diff --git a/pkg/binfmt/Dockerfile b/pkg/binfmt/Dockerfile index 3751ba97f..a83fce606 100644 --- a/pkg/binfmt/Dockerfile +++ b/pkg/binfmt/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS qemu +FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e AS qemu RUN apk add \ qemu-aarch64 \ qemu-arm \ diff --git a/pkg/binfmt/Makefile b/pkg/binfmt/Makefile index 9f997c2d0..8b2506aa7 100644 --- a/pkg/binfmt/Makefile +++ b/pkg/binfmt/Makefile @@ -1,14 +1,15 @@ .PHONY: tag push default: push +ORG?=linuxkit IMAGE=binfmt DEPS=Dockerfile Makefile main.go $(wildcard etc/binmft.d/*) HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') tag: $(DEPS) - docker build --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) . + docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) . push: tag - DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \ - DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH) + DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \ + DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH) diff --git a/pkg/ca-certificates/Dockerfile b/pkg/ca-certificates/Dockerfile index 9010c037b..7e7a0c26f 100644 --- a/pkg/ca-certificates/Dockerfile +++ b/pkg/ca-certificates/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb as alpine +FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e as alpine RUN apk add ca-certificates diff --git a/pkg/ca-certificates/Makefile b/pkg/ca-certificates/Makefile index 8e6bbd894..8b019ad90 100644 --- a/pkg/ca-certificates/Makefile +++ b/pkg/ca-certificates/Makefile @@ -1,5 +1,6 @@ .PHONY: tag push +ORG?=linuxkit IMAGE=ca-certificates HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') @@ -7,7 +8,7 @@ HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') default: push tag: Dockerfile - docker build --network=none -t linuxkit/$(IMAGE):$(HASH) . + docker build --network=none -t $(ORG)/$(IMAGE):$(HASH) . push: tag - docker pull linuxkit/$(IMAGE):$(HASH) || docker push linuxkit/$(IMAGE):$(HASH) + docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH) diff --git a/pkg/containerd/Dockerfile b/pkg/containerd/Dockerfile index bcab2f908..c3a430e4a 100644 --- a/pkg/containerd/Dockerfile +++ b/pkg/containerd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d0cef04aa75159e373fa08a49478ed6bf4adb9b4@sha256:4d8e181db968645b8b3308d2fe725e6f7bb9d9d44a9c3c7782e86c02a6d9e0f1 as alpine +FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e as alpine RUN \ apk add \ btrfs-progs-dev \ diff --git a/pkg/containerd/Makefile b/pkg/containerd/Makefile index 55ed50160..5dd0274c0 100644 --- a/pkg/containerd/Makefile +++ b/pkg/containerd/Makefile @@ -1,5 +1,6 @@ .PHONY: tag push +ORG?=linuxkit IMAGE=containerd HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') @@ -7,7 +8,7 @@ HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') default: push tag: Dockerfile - docker build -t linuxkit/$(IMAGE):$(HASH) . + docker build -t $(ORG)/$(IMAGE):$(HASH) . push: tag - docker pull linuxkit/$(IMAGE):$(HASH) || docker push linuxkit/$(IMAGE):$(HASH) + docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH) diff --git a/pkg/rngd/Dockerfile b/pkg/rngd/Dockerfile index 09cd1ff5a..592639453 100644 --- a/pkg/rngd/Dockerfile +++ b/pkg/rngd/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS build +FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e AS build RUN apk add \ argp-standalone \ automake \ diff --git a/pkg/rngd/Makefile b/pkg/rngd/Makefile index abb53426c..33601e95f 100644 --- a/pkg/rngd/Makefile +++ b/pkg/rngd/Makefile @@ -1,14 +1,15 @@ .PHONY: tag push default: push +ORG?=linuxkit IMAGE=rngd DEPS=Dockerfile HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') tag: $(DEPS) - docker build --no-cache -t linuxkit/$(IMAGE):$(HASH) . + docker build --no-cache -t $(ORG)/$(IMAGE):$(HASH) . push: tag - DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \ - DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH) + DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \ + DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH) diff --git a/pkg/runc/Dockerfile b/pkg/runc/Dockerfile index e65963330..e580a752c 100644 --- a/pkg/runc/Dockerfile +++ b/pkg/runc/Dockerfile @@ -1,4 +1,4 @@ -FROM linuxkit/alpine:d0cef04aa75159e373fa08a49478ed6bf4adb9b4@sha256:4d8e181db968645b8b3308d2fe725e6f7bb9d9d44a9c3c7782e86c02a6d9e0f1 as alpine +FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e as alpine RUN \ apk add \ bash \ diff --git a/pkg/runc/Makefile b/pkg/runc/Makefile index 337150a18..1a56b0c9c 100644 --- a/pkg/runc/Makefile +++ b/pkg/runc/Makefile @@ -1,5 +1,6 @@ .PHONY: tag push +ORG?=linuxkit IMAGE=runc HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') @@ -7,7 +8,7 @@ HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') default: push tag: Dockerfile - docker build -t linuxkit/$(IMAGE):$(HASH) . + docker build -t $(ORG)/$(IMAGE):$(HASH) . push: tag - docker pull linuxkit/$(IMAGE):$(HASH) || docker push linuxkit/$(IMAGE):$(HASH) + docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH)