mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #22236 from kencochrane/remove_git_from_rpm
Exclude .git directories from the source RPMS and debian packages
This commit is contained in:
commit
4531c01509
2 changed files with 5 additions and 4 deletions
|
@ -61,6 +61,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
|
||||
|
@ -99,7 +100,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" . )
|
||||
|
|
|
@ -120,9 +120,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 \
|
||||
|
|
Loading…
Add table
Reference in a new issue