github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-19 09:16:29 +00:00
Code Issues Projects Releases Wiki Activity

containerd: Bump to new alpine (with v1.0.0-alpha2)

Browse Source 
The logrus import path has changed, so adjust. Also there is a minor API change
to the containerd.IOCreation() function spec, it now takes a string id which we
can ignore.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-07-27 10:44:01 +01:00
parent c8164c0a6e
commit 8eb6709a3c
5 changed files with 6 additions and 6 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: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
test/pkg/containerd/Dockerfile
View File

@ -1,4 +1,4 @@
FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
FROM linuxkit/alpine:3b03eeb1b4cc58800b9f3608b6f148a044227df5 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)