Skip to content

Commit 8f75982

Browse files
committed
merge branch 'oci-validation'
Closes: cyphar/umoci#31 Signed-off-by: Aleksa Sarai <[email protected]>
2 parents 713fda4 + 4adb1d2 commit 8f75982

File tree

11 files changed

+235
-6
lines changed

11 files changed

+235
-6
lines changed

Dockerfile

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,16 @@ RUN zypper ar -f -p 10 -g obs://Virtualization:containers obs-vc && \
2323
zypper ar -f -p 10 -g obs://home:cyphar obs-cyphar && \
2424
zypper --gpg-auto-import-keys -n ref && \
2525
zypper -n up
26-
RUN zypper -n in 'go>=1.6' git make skopeo go-mtree bats jq
26+
RUN zypper -n in \
27+
bats \
28+
git \
29+
'go>=1.6' \
30+
go-mtree \
31+
jq \
32+
make \
33+
oci-image-tools \
34+
oci-runtime-tools \
35+
skopeo
2736

2837
ENV GOPATH /go
2938
ENV PATH $GOPATH/bin:$PATH

image/generator/runtime.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,11 @@ func MutateRuntimeSpec(g rgen.Generator, rootfs string, image v1.Image) error {
107107
g.SetLinuxResourcesMemorySwap(uint64(image.Config.MemorySwap))
108108

109109
for vol := range image.Config.Volumes {
110-
// XXX: Is it fine to generate source=""?
111-
g.AddBindMount("", vol, []string{"rw", "rbind"})
110+
// XXX: This is _fine_ but might cause some issues in the future.
111+
g.AddTmpfsMount(vol, []string{"rw"})
112112
}
113113

114+
// TODO: Handle annotations (both manifest and config annotations).
115+
114116
return nil
115117
}

0 commit comments

Comments
 (0)