diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-04 23:05:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 23:05:19 +0100 |
| commit | 778f9867fdf0e5c777f6391f847b04758cab5d45 (patch) | |
| tree | ba44e012f04d8054bf3a71e7ebcb1ddcef9a41d5 | |
| parent | 0138430e10c9e111b9ab544e31bcb2727eb1a528 (diff) | |
| parent | 5eb6fbe1c2373195c08b979e52498f0389a1f43e (diff) | |
| download | podman-778f9867fdf0e5c777f6391f847b04758cab5d45.tar.gz podman-778f9867fdf0e5c777f6391f847b04758cab5d45.tar.bz2 podman-778f9867fdf0e5c777f6391f847b04758cab5d45.zip | |
Merge pull request #2253 from kunalkushwaha/quick-dockerfile-build
Reduce Dockerfile based build time for libpod.
| -rw-r--r-- | Dockerfile | 17 | ||||
| -rw-r--r-- | Makefile | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Dockerfile b/Dockerfile index 59b5d5da3..6d44b963f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,9 +41,16 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends \ && apt-get clean -ADD . /go/src/github.com/containers/libpod - -RUN set -x && cd /go/src/github.com/containers/libpod && make install.libseccomp.sudo +ENV LIBSECCOMP_COMMIT release-2.3 +RUN set -x \ + && git clone https://github.com/seccomp/libseccomp "$GOPATH/src/github.com/seccomp/libseccomp" \ + && cd "$GOPATH/src/github.com/seccomp/libseccomp" \ + && git fetch origin --tags \ + && git checkout -q "$LIBSECCOMP_COMMIT" \ + && ./autogen.sh \ + && ./configure --prefix=/usr \ + && make all \ + && make install # Install runc ENV RUNC_COMMIT 96ec2177ae841256168fcf76954f7177af9446eb @@ -126,4 +133,8 @@ RUN mkdir -p /etc/containers && curl https://raw.githubusercontent.com/projectat COPY test/policy.json /etc/containers/policy.json COPY test/redhat_sigstore.yaml /etc/containers/registries.d/registry.access.redhat.com.yaml +ADD . /go/src/github.com/containers/libpod + +RUN set -x && cd /go/src/github.com/containers/libpod + WORKDIR /go/src/github.com/containers/libpod @@ -38,6 +38,7 @@ BUILD_INFO ?= $(shell date +%s) LIBPOD := ${PROJECT}/libpod LDFLAGS_PODMAN ?= $(LDFLAGS) -X $(LIBPOD).gitCommit=$(GIT_COMMIT) -X $(LIBPOD).buildInfo=$(BUILD_INFO) ISODATE ?= $(shell date --iso-8601) +#Update to LIBSECCOMP_COMMIT should reflect in Dockerfile too. LIBSECCOMP_COMMIT := release-2.3 # If GOPATH not specified, use one in the local directory |