Merge pull request #913 from runcom/v1.0.0-rc2-patches

V1.0.0 rc2 patches
This commit is contained in:
Mrunal Patel 2017-09-17 21:03:54 -07:00 committed by GitHub
commit 7e7a097395
26 changed files with 661 additions and 116 deletions

View file

@ -35,6 +35,7 @@ RUN apt-get update && apt-get install -y \
libgpgme11-dev \
liblzma-dev \
netcat \
socat \
--no-install-recommends \
&& apt-get clean
@ -113,7 +114,3 @@ COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redh
WORKDIR /go/src/github.com/kubernetes-incubator/cri-o
ADD . /go/src/github.com/kubernetes-incubator/cri-o
RUN make test/copyimg/copyimg \
&& mkdir -p .artifacts/redis-image \
&& ./test/copyimg/copyimg --import-from=docker://redis --export-to=dir:.artifacts/redis-image --signature-policy ./test/policy.json