From a824186ac9803ef5f7548df790988a4ebd2d9c07 Mon Sep 17 00:00:00 2001 From: baude Date: Wed, 25 Apr 2018 13:26:52 -0500 Subject: Use buildah commit and bud in podman Vendor in buildah and use as much of commit and bug as possible for podman build and commit. Resolves #586 Signed-off-by: baude Closes: #681 Approved by: mheon --- Dockerfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Dockerfile') diff --git a/Dockerfile b/Dockerfile index 30bf36915..d25fe0258 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM golang:1.8 -# libseccomp in jessie is not _quite_ new enough -- need backports version RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list RUN apt-get update && apt-get install -y \ @@ -22,8 +21,6 @@ RUN apt-get update && apt-get install -y \ libostree-dev \ libprotobuf-dev \ libprotobuf-c0-dev \ - libseccomp2/jessie-backports \ - libseccomp-dev/jessie-backports \ libtool \ libudev-dev \ protobuf-c-compiler \ @@ -41,6 +38,10 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ && apt-get clean +ADD . /go/src/github.com/projectatomic/libpod + +RUN set -x && cd /go/src/github.com/projectatomic/libpod && make install.libseccomp + # install criu ENV CRIU_VERSION 1.7 RUN mkdir -p /usr/src/criu \ @@ -117,5 +118,3 @@ COPY test/policy.json /etc/containers/policy.json COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml WORKDIR /go/src/github.com/projectatomic/libpod - -ADD . /go/src/github.com/projectatomic/libpod -- cgit v1.2.3-54-g00ecf