kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #22236 from kencochrane/remove_git_from_rpm

Browse source 
Exclude .git directories from the source RPMS and debian packages
This commit is contained in:
Alexander Morozov 2016-05-06 11:16:12 -07:00
commit 4531c01509
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hack/make/build-deb
View file

@ -61,6 +61,7 @@ set -e
FROM $image FROM $image
WORKDIR /usr/src/docker WORKDIR /usr/src/docker
COPY . /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 \ 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 && ln -snf /usr/src/docker /go/src/github.com/docker/docker
EOF EOF
@ -99,7 +100,7 @@ set -e
;; ;;
esac esac
cat >> "$DEST/$version/Dockerfile.build" <<-EOF cat >> "$DEST/$version/Dockerfile.build" <<-EOF
RUN dpkg-buildpackage -uc -us RUN dpkg-buildpackage -uc -us -I.git
EOF EOF
tempImage="docker-temp/build-deb:$version" tempImage="docker-temp/build-deb:$version"
( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) ( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . )

6
hack/make/build-rpm
View file

@ -120,9 +120,9 @@ set -e
WORKDIR /root/rpmbuild WORKDIR /root/rpmbuild
RUN ln -sfv /usr/src/${rpmName}/hack/make/.build-rpm SPECS RUN ln -sfv /usr/src/${rpmName}/hack/make/.build-rpm SPECS
WORKDIR /root/rpmbuild/SPECS WORKDIR /root/rpmbuild/SPECS
RUN tar -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName} RUN tar --exclude .git -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 --exclude .git -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 /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc
RUN gzip /root/rpmbuild/SOURCES/${rpmName}.tar 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 { cat /usr/src/${rpmName}/contrib/builder/rpm/${PACKAGE_ARCH}/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec
RUN rpmbuild -ba \ RUN rpmbuild -ba \