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 <[email protected]> Closes: #681 Approved by: mheon
containers · Apr 27, 2018 · a824186 · a824186
1 parent 4e468ce
commit a824186
Show file tree

Hide file tree

Showing 199 changed files with 22,539 additions and 2,013 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ services:
 
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev libseccomp-dev
+  - sudo apt-get -qq install btrfs-tools libdevmapper-dev libgpgme11-dev libapparmor-dev
   - sudo apt-get -qq install autoconf automake bison e2fslibs-dev libfuse-dev libtool liblzma-dev gettext
 
 install:
@@ -30,12 +30,10 @@ jobs:
       go: 1.9.x
     - script:
         - make testunit
-        - make
       go: 1.8.x
     - stage: Build and Verify
       script:
         - make testunit
-        - make
       go: 1.9.x
     - stage: Integration Test
       script:

diff --git 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
diff --git a/Makefile b/Makefile
@@ -29,6 +29,7 @@ COMMIT_NO := $(shell git rev-parse HEAD 2> /dev/null || true)
 GIT_COMMIT := $(if $(shell git status --porcelain --untracked-files=no),"${COMMIT_NO}-dirty","${COMMIT_NO}")
 BUILD_INFO := $(shell date +%s)
 ISODATE := $(shell date --iso-8601)
+LIBSECCOMP_COMMIT := release-2.3
 
 # If GOPATH not specified, use one in the local directory
 ifeq ($(GOPATH),)
@@ -249,6 +250,13 @@ install.tools: .install.gitvalidation .install.gometalinter .install.md2man
 
 varlink_generate: .gopathok cmd/podman/varlink/ioprojectatomicpodman.go
 
+.PHONY: install.libseccomp
+install.libseccomp:
+	rm -rf ../../seccomp/libseccomp
+	git clone https://github.com/seccomp/libseccomp ../../seccomp/libseccomp
+	cd ../../seccomp/libseccomp && git checkout $(LIBSECCOMP_COMMIT) && ./autogen.sh && ./configure --prefix=/usr && make all && make install
+
+
 cmd/podman/varlink/ioprojectatomicpodman.go: cmd/podman/varlink/io.projectatomic.podman.varlink
 	$(GO) generate ./cmd/podman/varlink/...
 
@@ -267,4 +275,5 @@ validate: gofmt .gitvalidation
 	uninstall \
 	shell \
 	changelog \
-	validate
+	validate \
+	install.libseccomp