From f1ad6f127bf83dfd549166120d16fceea7c9b3e6 Mon Sep 17 00:00:00 2001 From: Ken Cochrane Date: Thu, 21 Apr 2016 16:01:49 -0400 Subject: [PATCH] Exclude .git directories from the source RPMS Ignore .git directory when creating debian sources Added missing DOCKER_GITCOMMIT env variable to build-deb Signed-off-by: Ken Cochrane --- hack/make/build-deb | 3 ++- hack/make/build-rpm | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hack/make/build-deb b/hack/make/build-deb index 102d5351d2..d66d55d36b 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -58,6 +58,7 @@ set -e FROM $image WORKDIR /usr/src/docker COPY . /usr/src/docker + ENV DOCKER_GITCOMMIT $GITCOMMIT RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers \ && ln -snf /usr/src/docker /go/src/github.com/docker/docker EOF @@ -96,7 +97,7 @@ set -e ;; esac cat >> "$DEST/$version/Dockerfile.build" <<-EOF - RUN dpkg-buildpackage -uc -us + RUN dpkg-buildpackage -uc -us -I.git EOF tempImage="docker-temp/build-deb:$version" ( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 79fe5eee7d..d4ce6cd2cd 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -117,9 +117,9 @@ set -e WORKDIR /root/rpmbuild RUN ln -sfv /usr/src/${rpmName}/hack/make/.build-rpm SPECS WORKDIR /root/rpmbuild/SPECS - RUN tar -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName} - RUN tar -r -C /go/src/github.com/docker -f /root/rpmbuild/SOURCES/${rpmName}.tar containerd - RUN tar -r -C /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc + RUN tar --exclude .git -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName} + RUN tar --exclude .git -r -C /go/src/github.com/docker -f /root/rpmbuild/SOURCES/${rpmName}.tar containerd + RUN tar --exclude .git -r -C /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc RUN gzip /root/rpmbuild/SOURCES/${rpmName}.tar RUN { cat /usr/src/${rpmName}/contrib/builder/rpm/${PACKAGE_ARCH}/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec RUN rpmbuild -ba \