diff options
| author | baude <bbaude@redhat.com> | 2018-04-25 13:26:52 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-04-27 20:51:07 +0000 |
| commit | a824186ac9803ef5f7548df790988a4ebd2d9c07 (patch) | |
| tree | 63c64e9be4d9c44bd160dd974b740231497eabcd /Dockerfile | |
| parent | 4e468ce83d69e9748e80eb98a6f5bd3c5114cc7d (diff) | |
| download | podman-a824186ac9803ef5f7548df790988a4ebd2d9c07.tar.gz podman-a824186ac9803ef5f7548df790988a4ebd2d9c07.tar.bz2 podman-a824186ac9803ef5f7548df790988a4ebd2d9c07.zip | |
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 <bbaude@redhat.com>
Closes: #681
Approved by: mheon
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 9 |
1 files changed, 4 insertions, 5 deletions
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 |