mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 09:16:29 +00:00
Merge pull request #1774 from rneugeba/no-c
Remove the c-compile package
This commit is contained in:
commit
f422c0604b
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -18,19 +18,19 @@ onboot:
|
||||
- name: sysfs
|
||||
image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: format
|
||||
image: "linuxkit/format:a16f2bd94a83dd0cea4d490f710567a0cc60be33"
|
||||
image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
- CAP_MKNOD
|
||||
- name: mount
|
||||
image: "linuxkit/mount:ad138d252798d9d0d6779f7f4d35b7fbcbbeefb9"
|
||||
image: "linuxkit/mount:fc7164d7c4e1fe5d1da395c7f949fb332cffe752"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
- /var:/var:rshared,rbind
|
||||
@ -40,13 +40,13 @@ onboot:
|
||||
command: ["/mount.sh", "/var/lib/docker"]
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -57,7 +57,7 @@ services:
|
||||
net: host
|
||||
oomScoreAdj: -800
|
||||
- name: ntpd
|
||||
image: "linuxkit/openntpd:1eb0c05499500c8e44df6160524b79b776bbaa9e"
|
||||
image: "linuxkit/openntpd:a38eabb308d0405f58894979f8b8031a6c7e1134"
|
||||
capabilities:
|
||||
- CAP_SYS_TIME
|
||||
- CAP_SYS_NICE
|
||||
@ -66,7 +66,7 @@ services:
|
||||
- CAP_SETGID
|
||||
net: host
|
||||
- name: docker
|
||||
image: "linuxkit/docker-ce:18d9d2719bc99514c5b1883d5c8a36619e5acb4d"
|
||||
image: "linuxkit/docker-ce:957306b51f2bc03087833eee2625d60514a5079c"
|
||||
capabilities:
|
||||
- all
|
||||
net: host
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -16,7 +16,7 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -37,7 +37,7 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
|
@ -2,12 +2,12 @@ kernel:
|
||||
image: "linuxkit/kernel:4.9.x"
|
||||
cmdline: "console=ttyS0 console=tty0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:f71c3b30ac1ba4ef16c160c89610fa4976f9752f
|
||||
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
|
||||
onboot:
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
|
@ -2,17 +2,17 @@ kernel:
|
||||
image: "linuxkit/kernel:4.9.x"
|
||||
cmdline: "console=ttyS0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:f71c3b30ac1ba4ef16c160c89610fa4976f9752f
|
||||
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:e10e2efc1b78ef41d196175cbc07e069391f406e
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -16,12 +16,12 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
|
@ -9,7 +9,7 @@ init:
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
services:
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
|
||||
@ -16,12 +16,12 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
|
@ -16,12 +16,12 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -32,14 +32,14 @@ onboot:
|
||||
net: host
|
||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||
- name: format
|
||||
image: "linuxkit/format:a16f2bd94a83dd0cea4d490f710567a0cc60be33"
|
||||
image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
- CAP_MKNOD
|
||||
- name: mount
|
||||
image: "linuxkit/mount:ad138d252798d9d0d6779f7f4d35b7fbcbbeefb9"
|
||||
image: "linuxkit/mount:fc7164d7c4e1fe5d1da395c7f949fb332cffe752"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
- /var:/var:rshared,rbind
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
|
||||
@ -17,13 +17,13 @@ onboot:
|
||||
readonly: true
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
|
@ -65,7 +65,7 @@ RUN DVER=$(basename $(find /tmp/kernel-modules/lib/modules/ -mindepth 1 -maxdept
|
||||
RUN printf "KERNEL_SOURCE=${KERNEL_SOURCE}\n" > /out/kernel-source-info
|
||||
|
||||
|
||||
FROM linuxkit/toybox-media:eee3dd4d72cd784801e95b1781e6c4f9d8a5e5eb@sha256:7f940e687164ee2676e11c61705c79f7dd2d144ee87ad17a494848a7045f5f53
|
||||
FROM linuxkit/toybox-media:b396a375852e5dffc002389d95e0658c8de72914@sha256:a317cc378946ee48cc011cdfc5aa08f0229f5bf10ff70e3690d8f60b36700033
|
||||
ENTRYPOINT []
|
||||
CMD []
|
||||
WORKDIR /
|
||||
|
10
linuxkit.yml
10
linuxkit.yml
@ -2,10 +2,10 @@ kernel:
|
||||
image: "linuxkit/kernel:4.9.x"
|
||||
cmdline: "console=ttyS0 console=tty0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:f71c3b30ac1ba4ef16c160c89610fa4976f9752f
|
||||
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
|
||||
@ -16,12 +16,12 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -33,7 +33,7 @@ onboot:
|
||||
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS qemu
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS qemu
|
||||
RUN apk add \
|
||||
qemu-aarch64 \
|
||||
qemu-arm \
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f as alpine
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb as alpine
|
||||
|
||||
RUN apk add ca-certificates
|
||||
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS mirror
|
||||
|
||||
FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS mirror
|
||||
|
||||
FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS mirror
|
||||
|
||||
FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
|
||||
|
@ -1,9 +1,6 @@
|
||||
FROM alpine:3.5
|
||||
|
||||
RUN \
|
||||
apk --no-cache update && \
|
||||
apk --no-cache upgrade -a && \
|
||||
apk --no-cache add \
|
||||
&& rm -rf /var/cache/apk/*
|
||||
|
||||
# Use sha256 here to get a fixed version
|
||||
FROM alpine:edge@sha256:99588bc8883c955c157d18fc3eaa4a3c1400c223e6c7cabca5f600a3e9f8d5cd
|
||||
ENTRYPOINT []
|
||||
CMD []
|
||||
WORKDIR /
|
||||
COPY . ./
|
||||
|
@ -1,39 +1,14 @@
|
||||
C_COMPILE=linuxkit/c-compile:63b085bbaec1aa7c42a7bd22a4b1c350d900617d
|
||||
START_STOP_DAEMON=sbin/start-stop-daemon
|
||||
|
||||
.PHONY: tag 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
|
||||
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)
|
||||
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/ .*//' > $@
|
||||
tag: $(DEPS)
|
||||
docker build --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) .
|
||||
|
||||
push: hash
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat 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:
|
||||
push: tag
|
||||
docker pull linuxkit/$(IMAGE):$(HASH) || \
|
||||
docker push linuxkit/$(IMAGE):$(HASH)
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS mirror
|
||||
|
||||
FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:f0169b60fb260d74025496ae6fd93213fecaba8f@sha256:23743c7206ebe8a609442c5ac7084a26ed45ce8f5213960428bca264225849f1 AS mirror
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS mirror
|
||||
|
||||
FROM alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
COPY --from=mirror /etc/apk/repositories /etc/apk/repositories
|
||||
|
@ -1,9 +1,18 @@
|
||||
FROM linuxkit/c-compile:f52f485825c890d581e82a62af6906c1d33d8e5d@sha256:473fd283a090d3546e93915adacf00c69a23ff615c95c968c4a40e8723985853 AS rng-build
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS build
|
||||
RUN apk add \
|
||||
argp-standalone \
|
||||
automake \
|
||||
gcc \
|
||||
linux-headers \
|
||||
make \
|
||||
musl-dev \
|
||||
patch
|
||||
|
||||
COPY . /
|
||||
|
||||
ENV pkgname=rng-tools pkgver=5
|
||||
RUN curl -O -sSL http://downloads.sourceforge.net/project/gkernel/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz
|
||||
|
||||
ADD http://downloads.sourceforge.net/project/gkernel/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz $pkgname-$pkgver.tar.gz
|
||||
RUN sha256sum -c sha256sums
|
||||
RUN zcat $pkgname-$pkgver.tar.gz | tar xf -
|
||||
|
||||
@ -22,12 +31,12 @@ RUN cd $pkgname-$pkgver && \
|
||||
RUN mkdir -p /tmp/dev /tmp/proc /tmp/sys
|
||||
|
||||
|
||||
FROM linuxkit/tini:6714d66b82b5397f497b2aa05764096ed1ffe7d7@sha256:ba594b96af6195737ce2df702196d7adea2cafde554e18940ee14ad575d27f3b
|
||||
FROM linuxkit/tini:cb32c9b3ceb16505e1d62919cf28c8b52bf6d57e@sha256:1645296b3e155f8cf672f71f8d20b274bf38ee94c39dd1b58f7b18e0163b00b8
|
||||
ENTRYPOINT []
|
||||
WORKDIR /
|
||||
COPY --from=rng-build usr/sbin/rngd usr/sbin/rngd
|
||||
COPY --from=build usr/sbin/rngd usr/sbin/rngd
|
||||
# Can't create directories, so copy empty dirs from previous context
|
||||
COPY --from=rng-build tmp/dev dev
|
||||
COPY --from=rng-build tmp/proc proc
|
||||
COPY --from=rng-build tmp/sys sys
|
||||
COPY --from=build tmp/dev dev
|
||||
COPY --from=build tmp/proc proc
|
||||
COPY --from=build tmp/sys sys
|
||||
CMD ["/bin/tini", "/usr/sbin/rngd", "-f"]
|
||||
|
@ -2,40 +2,13 @@
|
||||
default: push
|
||||
|
||||
IMAGE=rngd
|
||||
BASE=linuxkit/c-compile:f52f485825c890d581e82a62af6906c1d33d8e5d
|
||||
SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
DEPS=Dockerfile Makefile
|
||||
DEPS=Dockerfile
|
||||
|
||||
hash: $(DEPS)
|
||||
find $^ -type f | xargs cat | docker run --rm -i $(SHA_IMAGE) sha1sum - | sed 's/ .*//' > hash
|
||||
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
|
||||
|
||||
tag: hash
|
||||
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(DOCKER_CONTENT_TRUST=1 docker pull $(BASE) && \
|
||||
docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
tag: $(DEPS)
|
||||
docker build --no-cache -t linuxkit/$(IMAGE):$(HASH) .
|
||||
|
||||
push: tag
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
signed-tag: hash
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(DOCKER_CONTENT_TRUST=1 docker pull $(BASE) && \
|
||||
docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
|
||||
sign: signed-tag
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
clean:
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH)
|
||||
|
@ -2,10 +2,10 @@ kernel:
|
||||
image: "linuxkit/kernel:4.9.x"
|
||||
cmdline: "console=ttyS0 console=tty0 page_poison=1"
|
||||
init:
|
||||
- linuxkit/init:f71c3b30ac1ba4ef16c160c89610fa4976f9752f
|
||||
- linuxkit/init:6c9b2dfac4ac446e57ad83e9817db4b5a334301c
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:fe1b7f438a234cb6481c6538295115eac2a0596d
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -16,14 +16,14 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: format
|
||||
image: "linuxkit/format:a16f2bd94a83dd0cea4d490f710567a0cc60be33"
|
||||
image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
- CAP_MKNOD
|
||||
- name: mount
|
||||
image: "linuxkit/mount:ad138d252798d9d0d6779f7f4d35b7fbcbbeefb9"
|
||||
image: "linuxkit/mount:fc7164d7c4e1fe5d1da395c7f949fb332cffe752"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
- /var:/var:rshared,rbind
|
||||
@ -32,7 +32,7 @@ onboot:
|
||||
rootfsPropagation: shared
|
||||
command: ["/mount.sh", "/var/lib/etcd"]
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -59,7 +59,7 @@ services:
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: ntpd
|
||||
image: "linuxkit/openntpd:1eb0c05499500c8e44df6160524b79b776bbaa9e"
|
||||
image: "linuxkit/openntpd:a38eabb308d0405f58894979f8b8031a6c7e1134"
|
||||
capabilities:
|
||||
- CAP_SYS_TIME
|
||||
- CAP_SYS_NICE
|
||||
|
@ -16,7 +16,7 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -18,12 +18,12 @@ onboot:
|
||||
- name: sysfs
|
||||
image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: format
|
||||
image: "linuxkit/format:a16f2bd94a83dd0cea4d490f710567a0cc60be33"
|
||||
image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
capabilities:
|
||||
@ -46,7 +46,7 @@ services:
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -57,7 +57,7 @@ services:
|
||||
net: host
|
||||
oomScoreAdj: -800
|
||||
- name: ntpd
|
||||
image: "linuxkit/openntpd:1eb0c05499500c8e44df6160524b79b776bbaa9e"
|
||||
image: "linuxkit/openntpd:a38eabb308d0405f58894979f8b8031a6c7e1134"
|
||||
capabilities:
|
||||
- CAP_SYS_TIME
|
||||
- CAP_SYS_NICE
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -18,12 +18,12 @@ onboot:
|
||||
- name: sysfs
|
||||
image: linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: format
|
||||
image: "linuxkit/format:a16f2bd94a83dd0cea4d490f710567a0cc60be33"
|
||||
image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
capabilities:
|
||||
@ -46,7 +46,7 @@ services:
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -57,7 +57,7 @@ services:
|
||||
net: host
|
||||
oomScoreAdj: -800
|
||||
- name: ntpd
|
||||
image: "linuxkit/openntpd:1eb0c05499500c8e44df6160524b79b776bbaa9e"
|
||||
image: "linuxkit/openntpd:a38eabb308d0405f58894979f8b8031a6c7e1134"
|
||||
capabilities:
|
||||
- CAP_SYS_TIME
|
||||
- CAP_SYS_NICE
|
||||
|
@ -1,6 +1,6 @@
|
||||
import 'common.rb'
|
||||
|
||||
from "linuxkit/mount:ad138d252798d9d0d6779f7f4d35b7fbcbbeefb9"
|
||||
from "linuxkit/mount:fc7164d7c4e1fe5d1da395c7f949fb332cffe752"
|
||||
|
||||
script = [
|
||||
mount_bind_hostns_self("/etc/cni"), mount_make_hostns_rshared("/etc/cni"),
|
||||
|
@ -17,12 +17,12 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
|
@ -16,7 +16,7 @@ onboot:
|
||||
- CAP_SYS_ADMIN
|
||||
readonly: true
|
||||
- name: binfmt
|
||||
image: linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a
|
||||
image: linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c"
|
||||
@ -21,7 +21,7 @@ services:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
|
@ -20,7 +20,7 @@ services:
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
|
@ -20,7 +20,7 @@ RUN cp -a boot/System.map-* /out/System.map
|
||||
RUN tar cf /out/kernel.tar lib
|
||||
RUN tar cf /out/kernel-dev.tar usr || true
|
||||
|
||||
FROM linuxkit/toybox-media:d7e82a7d19ccc84c9071fa7a88ecaa58ae958f7c@sha256:4c7d25f2be2429cd08417c36e04161cb924e46f3e419ee33a0aa9ff3a0942e02
|
||||
FROM linuxkit/toybox-media:b396a375852e5dffc002389d95e0658c8de72914@sha256:a317cc378946ee48cc011cdfc5aa08f0229f5bf10ff70e3690d8f60b36700033
|
||||
WORKDIR /
|
||||
ENTRYPOINT []
|
||||
CMD []
|
||||
|
@ -21,7 +21,7 @@ RUN cp -a boot/System.map-* /out/System.map || mv lib/modules/*/System.map /out/
|
||||
RUN tar cf /out/kernel.tar lib
|
||||
RUN tar cf /out/kernel-dev.tar usr || true
|
||||
|
||||
FROM linuxkit/toybox-media:d7e82a7d19ccc84c9071fa7a88ecaa58ae958f7c@sha256:4c7d25f2be2429cd08417c36e04161cb924e46f3e419ee33a0aa9ff3a0942e02
|
||||
FROM linuxkit/toybox-media:b396a375852e5dffc002389d95e0658c8de72914@sha256:a317cc378946ee48cc011cdfc5aa08f0229f5bf10ff70e3690d8f60b36700033
|
||||
WORKDIR /
|
||||
ENTRYPOINT []
|
||||
CMD []
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -18,19 +18,19 @@ onboot:
|
||||
- name: sysfs
|
||||
image: "linuxkit/sysfs:6c1d06f28ddd9681799d3950cddf044b930b221c"
|
||||
- name: binfmt
|
||||
image: "linuxkit/binfmt:aebd6ed6cc29921371ca78314697881086f4577a"
|
||||
image: "linuxkit/binfmt:131026c0cf6084467316395fed3b358f64bda00c"
|
||||
binds:
|
||||
- /proc/sys/fs/binfmt_misc:/binfmt_misc
|
||||
readonly: true
|
||||
- name: format
|
||||
image: "linuxkit/format:a16f2bd94a83dd0cea4d490f710567a0cc60be33"
|
||||
image: "linuxkit/format:d78093e943f9c88386e30c00353f9476d34fb551"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
- CAP_MKNOD
|
||||
- name: mount
|
||||
image: "linuxkit/mount:ad138d252798d9d0d6779f7f4d35b7fbcbbeefb9"
|
||||
image: "linuxkit/mount:fc7164d7c4e1fe5d1da395c7f949fb332cffe752"
|
||||
binds:
|
||||
- /dev:/dev
|
||||
- /var:/var:rshared,rbind
|
||||
@ -40,13 +40,13 @@ onboot:
|
||||
command: ["/mount.sh", "/var/lib/docker"]
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp/etc:/etc
|
||||
@ -57,7 +57,7 @@ services:
|
||||
net: host
|
||||
oomScoreAdj: -800
|
||||
- name: docker
|
||||
image: "linuxkit/docker-ce:741bf21513328f674e0cdcaa55492b0b75974e08"
|
||||
image: "linuxkit/docker-ce:957306b51f2bc03087833eee2625d60514a5079c"
|
||||
capabilities:
|
||||
- all
|
||||
net: host
|
||||
|
@ -5,10 +5,10 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
|
@ -5,7 +5,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: ltp
|
||||
image: "linuxkit/test-ltp-20170116:81229df2d25065b06f0a3071faaace8d66c87e67"
|
||||
|
@ -9,7 +9,7 @@ init:
|
||||
- linuxkit/init:63eed9ca7a09d2ce4c0c5e7238ac005fa44f564b
|
||||
- linuxkit/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9
|
||||
- linuxkit/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
|
||||
- linuxkit/ca-certificates:5fc6ba7f91534ddbfef975404c33e44581e6ed7a
|
||||
- linuxkit/ca-certificates:3344cdca1bc59fdfa17bd7f0fcbf491b9dbaa288
|
||||
onboot:
|
||||
- name: sysctl
|
||||
image: "linuxkit/sysctl:1f5ec5d5e6f7a7a1b3d2ff9dd9e36fd6fb14756a"
|
||||
@ -21,13 +21,13 @@ onboot:
|
||||
readonly: true
|
||||
services:
|
||||
- name: rngd
|
||||
image: "linuxkit/rngd:c42fd499690b2cb6e4e6cb99e41dfafca1cf5b14"
|
||||
image: "linuxkit/rngd:61a07ced77a9747708223ca16a4aec621eacf518"
|
||||
capabilities:
|
||||
- CAP_SYS_ADMIN
|
||||
oomScoreAdj: -800
|
||||
readonly: true
|
||||
- name: dhcpcd
|
||||
image: "linuxkit/dhcpcd:8837289b78ecd80f59524883085424e115dd0b3a"
|
||||
image: "linuxkit/dhcpcd:2def74ab3f9233b4c09ebb196ba47c27c08b0ed8"
|
||||
binds:
|
||||
- /var:/var
|
||||
- /tmp:/etc
|
||||
@ -38,7 +38,7 @@ services:
|
||||
net: host
|
||||
oomScoreAdj: -800
|
||||
- name: virtsock-server
|
||||
image: "linuxkit/test-virtsock:89133a5081b44dcda66e57502bcbc783e0a654be"
|
||||
image: "linuxkit/test-virtsock:bac78d3bffa55b9ab00eb023c32512e260d7fed0"
|
||||
readonly: true
|
||||
trust:
|
||||
image:
|
||||
|
@ -9,6 +9,6 @@ RUN git checkout $VIRTSOCK_COMMIT
|
||||
RUN make build/virtsock_stress.linux
|
||||
RUN cp -a build/virtsock_stress.linux /virtsock_stress
|
||||
|
||||
FROM linuxkit/tini:6714d66b82b5397f497b2aa05764096ed1ffe7d7@sha256:ba594b96af6195737ce2df702196d7adea2cafde554e18940ee14ad575d27f3b
|
||||
FROM linuxkit/tini:cb32c9b3ceb16505e1d62919cf28c8b52bf6d57e@sha256:1645296b3e155f8cf672f71f8d20b274bf38ee94c39dd1b58f7b18e0163b00b8
|
||||
COPY --from=virtsock-build virtsock_stress bin/virtsock_stress
|
||||
CMD ["/bin/tini", "/bin/virtsock_stress", "-s", "-v", "1"]
|
||||
|
@ -1,26 +1,14 @@
|
||||
.PHONY: tag push
|
||||
IMAGE=test-virtsock
|
||||
|
||||
default: push
|
||||
|
||||
IMAGE=test-virtsock
|
||||
DEPS=Dockerfile Makefile
|
||||
SHASUM=alpine:3.5
|
||||
hash: $(DEPS)
|
||||
find $^ -type f | xargs cat | DOCKER_CONTENT_TRUST=1 docker run --rm -i $(SHASUM) sha1sum | sed 's/ .*//' > $@
|
||||
|
||||
tag: hash
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
docker rmi $(IMAGE):build || true
|
||||
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
|
||||
|
||||
tag: $(DEPS)
|
||||
docker build --no-cache -t linuxkit/$(IMAGE):$(HASH) .
|
||||
|
||||
push: tag
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
|
||||
clean:
|
||||
rm -rf hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
docker pull linuxkit/$(IMAGE):$(HASH) || \
|
||||
docker push linuxkit/$(IMAGE):$(HASH)
|
||||
|
@ -1,25 +0,0 @@
|
||||
FROM alpine:3.5
|
||||
RUN \
|
||||
apk update && apk upgrade && \
|
||||
apk add \
|
||||
argp-standalone \
|
||||
automake \
|
||||
bash \
|
||||
bsd-compat-headers \
|
||||
build-base \
|
||||
cmake \
|
||||
curl \
|
||||
gcc \
|
||||
git \
|
||||
libc-dev \
|
||||
linux-headers \
|
||||
make \
|
||||
musl-dev \
|
||||
patch \
|
||||
util-linux-dev \
|
||||
vim \
|
||||
&& true
|
||||
|
||||
COPY compile.sh /usr/bin/
|
||||
|
||||
ENTRYPOINT ["/usr/bin/compile.sh"]
|
@ -1,41 +0,0 @@
|
||||
.PHONY: tag push
|
||||
|
||||
BASE=alpine:3.5
|
||||
IMAGE=c-compile
|
||||
|
||||
default: push
|
||||
|
||||
hash: Dockerfile compile.sh
|
||||
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
|
||||
tar cf - $^ | docker build --no-cache -t $(IMAGE):build -
|
||||
docker run --rm --entrypoint=/bin/sh $(IMAGE):build -c 'cat /lib/apk/db/installed /usr/bin/compile.sh | sha1sum' | sed 's/ .*//' > hash
|
||||
|
||||
push: hash
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat 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
|
||||
|
||||
signed-tag: hash
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(DOCKER_CONTENT_TRUST=1 docker pull $(BASE) && \
|
||||
docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
|
||||
sign: signed-tag
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
clean:
|
||||
rm -f hash
|
||||
|
||||
.DELETE_ON_ERROR:
|
@ -1,56 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# This is designed to compile a single package to a single binary
|
||||
# so it makes some assumptions about things to simplify config
|
||||
# to output a single binary (in a tarball) just use -o file
|
||||
# use --docker to output a tarball for input to docker build -
|
||||
|
||||
set -e
|
||||
|
||||
usage() {
|
||||
echo "Usage: -o file"
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ $# = 0 ] && usage
|
||||
|
||||
while [ $# -gt 0 ]
|
||||
do
|
||||
flag="$1"
|
||||
case "$flag" in
|
||||
-o)
|
||||
[ $# -eq 1 ] && usage
|
||||
out="$2"
|
||||
mkdir -p "$(dirname $2)"
|
||||
shift
|
||||
;;
|
||||
-l*)
|
||||
LIBS="$LIBS $1"
|
||||
shift
|
||||
;;
|
||||
*)
|
||||
echo "Unknown option $1"
|
||||
exit 1
|
||||
esac
|
||||
shift
|
||||
done
|
||||
|
||||
[ -z "$out" ] && usage
|
||||
|
||||
package=$(basename "$out")
|
||||
|
||||
dir="/src/$package"
|
||||
|
||||
mkdir -p $dir
|
||||
|
||||
# untar input
|
||||
tar xf - -C $dir
|
||||
|
||||
(
|
||||
cd $dir
|
||||
CFILES=$(find . -name '*.c')
|
||||
cc -static -O2 -Wall -Werror -o ../../$out $CFILES $LIBS
|
||||
)
|
||||
|
||||
tar cf - $out
|
||||
exit 0
|
@ -1,5 +1,11 @@
|
||||
FROM linuxkit/c-compile:f52f485825c890d581e82a62af6906c1d33d8e5d@sha256:473fd283a090d3546e93915adacf00c69a23ff615c95c968c4a40e8723985853 AS tini-build
|
||||
COPY . /
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS build
|
||||
RUN apk add \
|
||||
cmake \
|
||||
gcc \
|
||||
make \
|
||||
musl-dev \
|
||||
vim
|
||||
|
||||
ENV TINI_VERSION=0.13.0
|
||||
ADD https://github.com/krallin/tini/archive/v${TINI_VERSION}.tar.gz tini-${TINI_VERSION}.tar.gz
|
||||
|
||||
@ -10,4 +16,4 @@ FROM scratch
|
||||
ENTRYPOINT []
|
||||
CMD []
|
||||
WORKDIR /
|
||||
COPY --from=tini-build bin/tini bin/tini
|
||||
COPY --from=build bin/tini bin/tini
|
||||
|
@ -2,39 +2,13 @@
|
||||
default: push
|
||||
|
||||
IMAGE=tini
|
||||
BASE=linuxkit/c-compile:f52f485825c890d581e82a62af6906c1d33d8e5d
|
||||
SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
DEPS=Dockerfile Makefile
|
||||
DEPS=Dockerfile
|
||||
|
||||
hash: $(DEPS)
|
||||
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
|
||||
find $^ -type f | xargs cat | docker run --rm -i $(SHA_IMAGE) sha1sum - | sed 's/ .*//' > hash
|
||||
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
|
||||
|
||||
tag: hash
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
tag: $(DEPS)
|
||||
docker build --no-cache --network=none -t linuxkit/$(IMAGE):$(HASH) .
|
||||
|
||||
push: tag
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
signed-tag: hash
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(DOCKER_CONTENT_TRUST=1 docker pull $(BASE) && \
|
||||
docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
|
||||
sign: signed-tag
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
clean:
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH)
|
||||
|
@ -1,12 +1,18 @@
|
||||
FROM linuxkit/c-compile:f52f485825c890d581e82a62af6906c1d33d8e5d@sha256:473fd283a090d3546e93915adacf00c69a23ff615c95c968c4a40e8723985853 AS toybox-build
|
||||
COPY . .
|
||||
FROM linuxkit/alpine:c5021a113803f7608e3908014d316c3490183d0b@sha256:4c7a80173c71ca5019dc56f40442b3a8345f141dd46593bd1fe6d130294d07cb AS build
|
||||
RUN apk add \
|
||||
bash \
|
||||
gcc \
|
||||
git \
|
||||
make \
|
||||
musl-dev
|
||||
|
||||
ENV FILES="ls tar sh find sha1sum"
|
||||
# 0.7.2
|
||||
ENV LDFLAGS=--static
|
||||
RUN git clone https://github.com/landley/toybox.git && \
|
||||
cd toybox && git checkout b27d5d9ad0c56014d8661d91f69ee498bbbe4cf9 && \
|
||||
make defconfig
|
||||
cd toybox && git checkout b27d5d9ad0c56014d8661d91f69ee498bbbe4cf9
|
||||
WORKDIR /toybox
|
||||
RUN make defconfig
|
||||
RUN make ${FILES}
|
||||
RUN mkdir -p /out/bin
|
||||
RUN cp ${FILES} /out/bin
|
||||
@ -15,4 +21,4 @@ FROM scratch
|
||||
ENTRYPOINT []
|
||||
CMD []
|
||||
WORKDIR /
|
||||
COPY --from=toybox-build out/bin bin/
|
||||
COPY --from=build out/bin bin/
|
||||
|
@ -2,39 +2,13 @@
|
||||
default: push
|
||||
|
||||
IMAGE=toybox-media
|
||||
BASE=linuxkit/c-compile:f52f485825c890d581e82a62af6906c1d33d8e5d
|
||||
SHA_IMAGE=alpine:3.5@sha256:dfbd4a3a8ebca874ebd2474f044a0b33600d4523d03b0df76e5c5986cb02d7e8
|
||||
DEPS=Dockerfile Makefile
|
||||
DEPS=Dockerfile
|
||||
|
||||
hash: $(DEPS)
|
||||
DOCKER_CONTENT_TRUST=1 docker pull $(BASE)
|
||||
find $^ -type f | xargs cat | docker run --rm -i $(SHA_IMAGE) sha1sum - | sed 's/ .*//' > hash
|
||||
HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
|
||||
|
||||
tag: hash
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
tag: $(DEPS)
|
||||
docker build --no-cache -t linuxkit/$(IMAGE):$(HASH) .
|
||||
|
||||
push: tag
|
||||
docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
signed-tag: hash
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
(DOCKER_CONTENT_TRUST=1 docker pull $(BASE) && \
|
||||
docker build --no-cache -t $(IMAGE):build . && \
|
||||
docker tag $(IMAGE):build linuxkit/$(IMAGE):$(shell cat hash))
|
||||
|
||||
sign: signed-tag
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(shell cat hash) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(shell cat hash)
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
clean:
|
||||
rm -f hash
|
||||
docker rmi $(IMAGE):build || true
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
DOCKER_CONTENT_TRUST=1 docker pull linuxkit/$(IMAGE):$(HASH) || \
|
||||
DOCKER_CONTENT_TRUST=1 docker push linuxkit/$(IMAGE):$(HASH)
|
||||
|
Loading…
Reference in New Issue
Block a user