From 76d6751600fe91424171b886fdd87fb3eb3a1380 Mon Sep 17 00:00:00 2001 From: Jessica Frazelle Date: Thu, 23 Jul 2015 08:49:52 -0700 Subject: [PATCH] pass DOCKER_EXPERIMENTAL into build images Signed-off-by: Jessica Frazelle --- hack/make/build-deb | 5 +++++ hack/make/build-rpm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/hack/make/build-deb b/hack/make/build-deb index 72860d6b9e..deab30c238 100644 --- a/hack/make/build-deb +++ b/hack/make/build-deb @@ -52,6 +52,11 @@ set -e FROM $image WORKDIR /usr/src/docker COPY . /usr/src/docker + EOF + if [ "$DOCKER_EXPERIMENTAL" ]; then + echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build" + fi + cat >> "$DEST/$version/Dockerfile.build" <<-EOF RUN ln -sfv hack/make/.build-deb debian RUN { echo '$debSource (${debVersion}-0~${suite}) $suite; urgency=low'; echo; echo ' * Version: $VERSION'; echo; echo " -- $debMaintainer $debDate"; } > debian/changelog && cat >&2 debian/changelog RUN dpkg-buildpackage -uc -us diff --git a/hack/make/build-rpm b/hack/make/build-rpm index 6ad01c40c0..9606bbc5f6 100644 --- a/hack/make/build-rpm +++ b/hack/make/build-rpm @@ -55,6 +55,11 @@ set -e cat > "$DEST/$version/Dockerfile.build" <<-EOF FROM $image COPY . /usr/src/${rpmName} + EOF + if [ "$DOCKER_EXPERIMENTAL" ]; then + echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build" + fi + cat >> "$DEST/$version/Dockerfile.build" <<-EOF RUN mkdir -p /root/rpmbuild/SOURCES WORKDIR /root/rpmbuild RUN ln -sfv /usr/src/${rpmName}/hack/make/.build-rpm SPECS