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

pkg: Update most packages to new alpine base

Browse Source 
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 <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer 2017-05-18 12:29:53 +01:00
parent 98a99c6482
commit c1a873b489
10 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/binfmt/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS qemu FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e AS qemu
RUN apk add \ RUN apk add \
qemu-aarch64 \ qemu-aarch64 \
qemu-arm \ qemu-arm \

7
pkg/binfmt/Makefile
View File

@ -1,14 +1,15 @@
.PHONY: tag push .PHONY: tag push
default: push default: push
ORG?=linuxkit
IMAGE=binfmt IMAGE=binfmt
DEPS=Dockerfile Makefile main.go $(wildcard etc/binmft.d/*) DEPS=Dockerfile Makefile main.go $(wildcard etc/binmft.d/*)
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS) tag: $(DEPS)
docker build --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) . docker build --no-cache --network=none -t $(ORG)/$(IMAGE):$(HASH) .
push: tag push: tag
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \ DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH) DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

2
pkg/ca-certificates/Dockerfile
View File

@ -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 RUN apk add ca-certificates

5
pkg/ca-certificates/Makefile
View File

@ -1,5 +1,6 @@
.PHONY: tag push .PHONY: tag push
ORG?=linuxkit
IMAGE=ca-certificates IMAGE=ca-certificates
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') 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 default: push
tag: Dockerfile tag: Dockerfile
docker build --network=none -t linuxkit/$(IMAGE):$(HASH) . docker build --network=none -t $(ORG)/$(IMAGE):$(HASH) .
push: tag push: tag
docker pull linuxkit/$(IMAGE):$(HASH) || docker push linuxkit/$(IMAGE):$(HASH) docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH)

2
pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:d0cef04aa75159e373fa08a49478ed6bf4adb9b4@sha256:4d8e181db968645b8b3308d2fe725e6f7bb9d9d44a9c3c7782e86c02a6d9e0f1 as alpine FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e as alpine
RUN \ RUN \
apk add \ apk add \
btrfs-progs-dev \ btrfs-progs-dev \

5
pkg/containerd/Makefile
View File

@ -1,5 +1,6 @@
.PHONY: tag push .PHONY: tag push
ORG?=linuxkit
IMAGE=containerd IMAGE=containerd
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') 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 default: push
tag: Dockerfile tag: Dockerfile
docker build -t linuxkit/$(IMAGE):$(HASH) . docker build -t $(ORG)/$(IMAGE):$(HASH) .
push: tag push: tag
docker pull linuxkit/$(IMAGE):$(HASH) || docker push linuxkit/$(IMAGE):$(HASH) docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH)

2
pkg/rngd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS build FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e AS build
RUN apk add \ RUN apk add \
argp-standalone \ argp-standalone \
automake \ automake \

7
pkg/rngd/Makefile
View File

@ -1,14 +1,15 @@
.PHONY: tag push .PHONY: tag push
default: push default: push
ORG?=linuxkit
IMAGE=rngd IMAGE=rngd
DEPS=Dockerfile DEPS=Dockerfile
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
tag: $(DEPS) tag: $(DEPS)
docker build --no-cache -t linuxkit/$(IMAGE):$(HASH) . docker build --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
push: tag push: tag
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \ DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH) DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)

2
pkg/runc/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:d0cef04aa75159e373fa08a49478ed6bf4adb9b4@sha256:4d8e181db968645b8b3308d2fe725e6f7bb9d9d44a9c3c7782e86c02a6d9e0f1 as alpine FROM linuxkit/alpine:6336329f15b4166514782eaa555cf0ffd35c519c@sha256:f6c2ce92910b1d6e4e5557850a554f4a3ae9f66c1e89ad86a24d6c6e550f165e as alpine
RUN \ RUN \
apk add \ apk add \
bash \ bash \

5
pkg/runc/Makefile
View File

@ -1,5 +1,6 @@
.PHONY: tag push .PHONY: tag push
ORG?=linuxkit
IMAGE=runc IMAGE=runc
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}') 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 default: push
tag: Dockerfile tag: Dockerfile
docker build -t linuxkit/$(IMAGE):$(HASH) . docker build -t $(ORG)/$(IMAGE):$(HASH) .
push: tag push: tag
docker pull linuxkit/$(IMAGE):$(HASH) || docker push linuxkit/$(IMAGE):$(HASH) docker pull $(ORG)/$(IMAGE):$(HASH) || docker push $(ORG)/$(IMAGE):$(HASH)