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

Bump init and containerd package to v1.0.0-beta.1

Browse Source 
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:
Ian Campbell 2017-09-25 13:31:12 +01:00
parent fb94b23a93
commit 09c89a923b
4 changed files with 4 additions and 8 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:77287352db68b442534c0005edd6ff750c8189f3 as alpine FROM linuxkit/alpine:28254e4530703db4caa6b0199a025c30a987dfa1 as alpine
RUN apk add tzdata RUN apk add tzdata
WORKDIR $GOPATH/src/github.com/containerd/containerd WORKDIR $GOPATH/src/github.com/containerd/containerd

2
pkg/init/Dockerfile
View File

@ -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 RUN apk add --no-cache --initdb alpine-baselayout make gcc musl-dev git linux-headers
ADD usermode-helper.c ./ ADD usermode-helper.c ./

6
pkg/init/cmd/init/init.go
View File

@ -196,11 +196,7 @@ func copyFS(newRoot string) error {
} }
// chdir to "/" to fix up . and .. // chdir to "/" to fix up . and ..
if err := os.Chdir("/"); err != nil { return os.Chdir("/")
return err
}
return nil
} }
func main() { func main() {

2
test/pkg/containerd/Dockerfile
View File

@ -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/ RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
# btrfs-progfs is required for btrfs test (mkfs.btrfs) # btrfs-progfs is required for btrfs test (mkfs.btrfs)
# util-linux is required for btrfs test (losetup) # util-linux is required for btrfs test (losetup)