mirror of
https://github.com/linuxkit/linuxkit.git
synced 2025-07-19 17:26:28 +00:00
Bump init and containerd package to v1.0.0-beta.1
golint on pkg/init now complains: golint... ./init.go:199:2: redundant if ...; err != nil check, just return error instead. Resulting in a change which doesn't seem like an improvement to me. Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
parent
fb94b23a93
commit
09c89a923b
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:77287352db68b442534c0005edd6ff750c8189f3 as alpine
|
||||
FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 as alpine
|
||||
RUN apk add tzdata
|
||||
|
||||
WORKDIR $GOPATH/src/github.com/containerd/containerd
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS build
|
||||
FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 AS build
|
||||
RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
|
||||
|
||||
ADD usermode-helper.c ./
|
||||
|
@ -196,11 +196,7 @@ func copyFS(newRoot string) error {
|
||||
}
|
||||
|
||||
// chdir to "/" to fix up . and ..
|
||||
if err := os.Chdir("/"); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
return os.Chdir("/")
|
||||
}
|
||||
|
||||
func main() {
|
||||
|
@ -1,4 +1,4 @@
|
||||
FROM linuxkit/alpine:1e67b8fdba849ed2f7e8537c13b7f280639623d6 AS mirror
|
||||
FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 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)
|
||||
|
Loading…
Reference in New Issue
Block a user