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

Bump init and containerd packages to v1.0.0-alpha6

Browse Source 
Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-08-18 21:00:13 +01:00
parent 6d878dd65f
commit b0b08e18a2
4 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/containerd/Dockerfile
View File

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

4
pkg/init/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS build
FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS build
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
ADD usermode-helper.c ./
@ -13,7 +13,7 @@ RUN go-compile.sh /go/src/cmd/init
RUN cd /go/src/cmd/service && ./skanky-vendor.sh $GOPATH/src/github.com/containerd/containerd
RUN go-compile.sh /go/src/cmd/service
FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS mirror
FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 AS mirror
RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
RUN apk add --no-cache --initdb -p /out alpine-baselayout busybox musl

24
pkg/init/cmd/service/start.go
View File

@ -55,6 +55,24 @@ func startCmd(args []string) {
log.Debugf("Started %s pid %d", id, pid)
}
type cio struct {
config containerd.IOConfig
}
func (c *cio) Config() containerd.IOConfig {
return c.config
}
func (c *cio) Cancel() {
}
func (c *cio) Wait() {
}
func (c *cio) Close() error {
return nil
}
func start(service, sock, basePath, dumpSpec string) (string, uint32, string, error) {
path := filepath.Join(basePath, service)
@ -102,18 +120,20 @@ func start(service, sock, basePath, dumpSpec string) (string, uint32, string, er
return "", 0, "failed to create container", err
}
io := func(id string) (*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 {
// if we cannot write to log, discard output
logfile = "/dev/null"
}
return &containerd.IO{
return &cio{
containerd.IOConfig{
Stdin: "/dev/null",
Stdout: logfile,
Stderr: logfile,
Terminal: false,
},
}, nil
}

2
test/pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:a120ad6aead3fe583eaa20e9b75a05ac1b3487da AS mirror
FROM linuxkit/alpine:f4f5b333fa1a8433334fcae996d1637173144a72 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)