Ignore .git directory when creating debian sources
Added missing DOCKER_GITCOMMIT env variable to build-deb
Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
| ... | ... |
@@ -58,6 +58,7 @@ set -e |
| 58 | 58 |
FROM $image |
| 59 | 59 |
WORKDIR /usr/src/docker |
| 60 | 60 |
COPY . /usr/src/docker |
| 61 |
+ ENV DOCKER_GITCOMMIT $GITCOMMIT |
|
| 61 | 62 |
RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers \ |
| 62 | 63 |
&& ln -snf /usr/src/docker /go/src/github.com/docker/docker |
| 63 | 64 |
EOF |
| ... | ... |
@@ -96,7 +97,7 @@ set -e |
| 96 | 96 |
;; |
| 97 | 97 |
esac |
| 98 | 98 |
cat >> "$DEST/$version/Dockerfile.build" <<-EOF |
| 99 |
- RUN dpkg-buildpackage -uc -us |
|
| 99 |
+ RUN dpkg-buildpackage -uc -us -I.git |
|
| 100 | 100 |
EOF |
| 101 | 101 |
tempImage="docker-temp/build-deb:$version" |
| 102 | 102 |
( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . ) |
| ... | ... |
@@ -117,9 +117,9 @@ set -e |
| 117 | 117 |
WORKDIR /root/rpmbuild |
| 118 | 118 |
RUN ln -sfv /usr/src/${rpmName}/hack/make/.build-rpm SPECS
|
| 119 | 119 |
WORKDIR /root/rpmbuild/SPECS |
| 120 |
- RUN tar -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName}
|
|
| 121 |
- RUN tar -r -C /go/src/github.com/docker -f /root/rpmbuild/SOURCES/${rpmName}.tar containerd
|
|
| 122 |
- RUN tar -r -C /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc
|
|
| 120 |
+ RUN tar --exclude .git -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName}
|
|
| 121 |
+ RUN tar --exclude .git -r -C /go/src/github.com/docker -f /root/rpmbuild/SOURCES/${rpmName}.tar containerd
|
|
| 122 |
+ RUN tar --exclude .git -r -C /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc
|
|
| 123 | 123 |
RUN gzip /root/rpmbuild/SOURCES/${rpmName}.tar
|
| 124 | 124 |
RUN { cat /usr/src/${rpmName}/contrib/builder/rpm/${PACKAGE_ARCH}/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec
|
| 125 | 125 |
RUN rpmbuild -ba \ |