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

Merge pull request #2306 from ijc/containerd-v1.0.0-alpha2

Browse Source 
Containerd v1.0.0 alpha2
This commit is contained in:
Justin Cormack 2017-07-27 13:30:24 +01:00 committed by GitHub
commit 16674a1557
44 changed files with 54 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blueprints/docker-for-mac/base.yml
View File

@ -6,7 +6,7 @@ init:
- linuxkit/vpnkit-expose-port:e2b49a6c56fbf876ea24f0a5ce4ccae5f940d1be # install vpnkit-expose-port and vpnkit-iptables-wrapper on host
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
# support metadata for optional config in /var/config
- name: metadata

2
examples/aws.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/azure.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/docker.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/gcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/getty.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/minimal.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b

2
examples/node_exporter.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
services:
- name: getty
image: linuxkit/getty:894eef1e5f62f3bc31de8ffaff2b6c0e093c4595

2
examples/packet.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/redis-os.yml
View File

@ -6,7 +6,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b

2
examples/sshd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/swap.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
onboot:
- name: sysctl

2
examples/vmware.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
examples/vpnkit-forwarder.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b

2
examples/vsudd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b

2
examples/vultr.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
linuxkit.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:a39a433162a873519910a07beeb3e8db22529956 as alpine
FROM linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b as alpine
RUN \
apk add \
btrfs-progs-dev \

2
pkg/containerd/cmd/service/main.go
View File

@ -6,7 +6,7 @@ import (
"os"
"path/filepath"
log "github.com/Sirupsen/logrus"
log "github.com/sirupsen/logrus"
)
const (

4
pkg/containerd/cmd/service/start.go
View File

@ -9,10 +9,10 @@ import (
"os"
"path/filepath"
log "github.com/Sirupsen/logrus"
"github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
specs "github.com/opencontainers/runtime-spec/specs-go"
log "github.com/sirupsen/logrus"
)
func startCmd(args []string) {
@ -98,7 +98,7 @@ func start(service, sock, path, dumpSpec string) (string, uint32, string, error)
return "", 0, "failed to create container", err
}
io := func() (*containerd.IO, error) {
io := func(id string) (*containerd.IO, error) {
logfile := filepath.Join("/var/log", service+".log")
// We just need this to exist.
if err := ioutil.WriteFile(logfile, []byte{}, 0600); err != nil {

2
pkg/containerd/cmd/service/system_init.go
View File

@ -11,11 +11,11 @@ import (
"syscall"
"time"
log "github.com/Sirupsen/logrus"
"github.com/containerd/containerd"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/namespaces"
"github.com/pkg/errors"
log "github.com/sirupsen/logrus"
)
func cleanupTask(ctx context.Context, ctr containerd.Container) error {

2
projects/compose/compose-dynamic.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/compose/compose-static.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/etcd/etcd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/ima-namespace/ima-namespace.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
- linuxkit/ima-utils:dfeb3896fd29308b80ff9ba7fe5b8b767e40ca29
onboot:

2
projects/kubernetes/kube-master.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/kubernetes/kube-node.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/logging/examples/logging.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:12348442d56c2ee9abf13ff38dff2e36b515bd1e # with runc, logwrite, startmemlogd
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
- linuxkit/memlogd:9b5834189f598f43c507f6938077113906f51012
onboot:

2
projects/miragesdk/examples/fdd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
- samoht/fdd
onboot:

2
projects/miragesdk/examples/mirage-dhcp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0

2
projects/okernel/examples/okernel_simple.yaml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/shiftfs/shiftfs.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
projects/swarmd/swarmd.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

2
test/cases/010_platforms/010_hyperkit/010_acpi/test.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
services:
- name: acpid
image: linuxkit/acpid:1966310cb75e28ffc668863a6577ee991327f918

2
test/cases/030_security/000_docker-bench/test-docker-bench.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: sysctl

8
test/cases/040_packages/003_containerd/test-containerd.yml
View File

@ -4,16 +4,18 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b
command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
- name: sysctl
image: linuxkit/sysctl:d1a43c7c91e92374766f962dc8534cf9508756b0
- name: test
image: linuxkit/test-containerd:0e350ce958b379b9ddb2bcdd22aaf4508f6ddbc3
image: linuxkit/test-containerd:dd3f2ba599c70994ba875e7c86c04df2967e3144
- name: poweroff
image: linuxkit/poweroff:3845c4d64d47a1ea367806be5547e44594b0fa91
trust:
org:
- linuxkit

2
test/cases/040_packages/003_containerd/test.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh
# SUMMARY: Run containerd test
# LABELS: skip
# LABELS:
# REPEAT:
set -e

2
test/cases/040_packages/007_getty-containerd/test-ctr.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
- linuxkit/ca-certificates:67acf038c44bb191ebb704ec7bb39a1524052cdf
onboot:
- name: dhcpcd

2
test/hack/test-ltp.yml
View File

@ -4,7 +4,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: ltp
image: linuxkit/test-ltp:b8ad3dfd0998ddff4fd47b3f693d2a4aa93ab7a4

2
test/hack/test.yml
View File

@ -6,7 +6,7 @@ kernel:
init:
- linuxkit/init:4dcee04c04c900a5796dc719f8d16fea7e771059
- linuxkit/runc:f5960b83a8766ae083efc744fa63dbf877450e4f
- linuxkit/containerd:acd23f7c020e09799e03331e781f35965e19981f
- linuxkit/containerd:8fc87b7f465bde9ece781899a007f47b6d3c096b
onboot:
- name: dhcpcd
image: linuxkit/dhcpcd:17423c1ccced74e3c005fd80486e8177841fe02b

8
test/pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
FROM linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
# btrfs-progfs is required for btrfs test (mkfs.btrfs)
# util-linux is required for btrfs test (losetup)
@ -14,8 +14,10 @@ RUN apk add --no-cache --initdb -p /out \
linux-headers \
make \
musl \
util-linux
util-linux \
tzdata
RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache
RUN cp /out/usr/share/zoneinfo/UTC /out/etc/localtime
FROM scratch
COPY --from=mirror /out/ /
@ -29,4 +31,4 @@ RUN git checkout $CONTAINERD_COMMIT
ADD run.sh ./run.sh
ENTRYPOINT ["/bin/sh", "run.sh"]
LABEL org.mobyproject.config='{"net": "host", "capabilities": ["all"], "tmpfs": ["/tmp:exec"], "binds": ["/dev:/dev"]}'
LABEL org.mobyproject.config='{"net": "host", "capabilities": ["all"], "tmpfs": ["/tmp:exec"], "binds": ["/dev:/dev", "/etc/resolv.conf:/etc/resolv.conf", "/usr/bin/runc:/usr/bin/runc", "/usr/bin/containerd:/usr/bin/containerd", "/usr/bin/containerd-shim:/usr/bin/containerd-shim"], "mounts": [{"type": "cgroup", "options": ["rw","nosuid","noexec","nodev","relatime"]}],}'

5
tools/alpine/Dockerfile
View File

@ -52,6 +52,5 @@ COPY --from=mirror /Dockerfile /Dockerfile
RUN apk update && apk upgrade -a
# Update `FROM` in `test/pkg/containerd/Dockerfile` when changing this.
# v1.0.0-alpha1 plus https://github.com/containerd/containerd/pull/1141
ENV CONTAINERD_REPO=https://github.com/ijc/containerd.git
ENV CONTAINERD_COMMIT=d42cb88ba2b08d2ca6c8c017d629b394bf1dd08c
ENV CONTAINERD_REPO=https://github.com/containerd/containerd.git
ENV CONTAINERD_COMMIT=v1.0.0-alpha2

2
tools/alpine/Makefile
View File

@ -50,7 +50,7 @@ hash: Makefile iid
versions.$(ARCH): Makefile hash iid
echo "# $(ORG)/$(IMAGE):$(shell cat hash)" > versions.$(ARCH)
docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH)
docker run --rm $(shell cat iid) find /mirror -name '*.apk' -exec basename '{}' .apk \; | LANG=C sort | (echo '# automatically generated list of installed packages'; cat -) >> versions.$(ARCH)
push: hash iid versions.$(ARCH)
docker pull $(ORG)/$(IMAGE):$(shell cat hash) || \

2
tools/alpine/versions.x86_64
View File

@ -1,4 +1,4 @@
# linuxkit/alpine:77c8dfc5860012c869a19d7a2c68e701469692c8
# linuxkit/alpine:cb6a0b2b068d892996ebadae999d9baf6e08be5b
# automatically generated list of installed packages
abuild-3.0.0_rc2-r8
alpine-baselayout-3.0.4-r0