Merge pull request #2253 from kunalkushwaha/quick-dockerfile-build

Reduce Dockerfile based build time for libpod.
This commit is contained in:
OpenShift Merge Robot
2019-02-04 23:05:19 +01:00
committed by GitHub
2 changed files with 15 additions and 3 deletions

View File

@ -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

View File

@ -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