Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC02A1898B for ; Tue, 24 Nov 2015 19:24:54 +0000 (UTC) Received: (qmail 87208 invoked by uid 500); 24 Nov 2015 19:24:54 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 87175 invoked by uid 500); 24 Nov 2015 19:24:54 -0000 Mailing-List: contact commits-help@aurora.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.apache.org Delivered-To: mailing list commits@aurora.apache.org Received: (qmail 87166 invoked by uid 99); 24 Nov 2015 19:24:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 24 Nov 2015 19:24:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B1D62DFFB9; Tue, 24 Nov 2015 19:24:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.apache.org Message-Id: <9f641bdf0df34936b44fbd8d1622b784@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: aurora-packaging git commit: Copy artifacts from containers rather than using volume mounts. Date: Tue, 24 Nov 2015 19:24:54 +0000 (UTC) Repository: aurora-packaging Updated Branches: refs/heads/master 74fce5aff -> 255353a25 Copy artifacts from containers rather than using volume mounts. Bugs closed: AURORA-1539 Reviewed at https://reviews.apache.org/r/40658/ Project: http://git-wip-us.apache.org/repos/asf/aurora-packaging/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora-packaging/commit/255353a2 Tree: http://git-wip-us.apache.org/repos/asf/aurora-packaging/tree/255353a2 Diff: http://git-wip-us.apache.org/repos/asf/aurora-packaging/diff/255353a2 Branch: refs/heads/master Commit: 255353a2574a8256bc6314b0e6d5f5acb3b99135 Parents: 74fce5a Author: Bill Farner Authored: Tue Nov 24 11:24:19 2015 -0800 Committer: Bill Farner Committed: Tue Nov 24 11:24:19 2015 -0800 ---------------------------------------------------------------------- build-artifact.sh | 12 +++++++----- builder/deb/ubuntu-trusty/build.sh | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/255353a2/build-artifact.sh ---------------------------------------------------------------------- diff --git a/build-artifact.sh b/build-artifact.sh index 30e4384..0bb7ea6 100755 --- a/build-artifact.sh +++ b/build-artifact.sh @@ -32,18 +32,20 @@ run_build() { echo "Using docker image $IMAGE_NAME" docker build -t "$IMAGE_NAME" "$BUILDER_DIR" - ARTIFACT_DIR="$(pwd)/dist/$BUILDER_DIR" - mkdir -p $ARTIFACT_DIR docker run \ - --rm \ -e AURORA_VERSION=$AURORA_VERSION \ -v "$(pwd)/specs:/specs:ro" \ -v "$(realpath $RELEASE_TAR):/src.tar.gz:ro" \ -v "$ARTIFACT_DIR:/dist" \ -t "$IMAGE_NAME" /build.sh + container=$(docker ps -l -q) + artifact_dir="artifacts/$IMAGE_NAME" + mkdir -p "$artifact_dir" + docker cp $container:/dist "$artifact_dir" + docker rm "$container" - echo "Produced artifacts in $ARTIFACT_DIR:" - ls $ARTIFACT_DIR + echo "Produced artifacts in $artifact_dir:" + ls -R "$artifact_dir" } case $# in http://git-wip-us.apache.org/repos/asf/aurora-packaging/blob/255353a2/builder/deb/ubuntu-trusty/build.sh ---------------------------------------------------------------------- diff --git a/builder/deb/ubuntu-trusty/build.sh b/builder/deb/ubuntu-trusty/build.sh index bb2b799..e0aeaf5 100755 --- a/builder/deb/ubuntu-trusty/build.sh +++ b/builder/deb/ubuntu-trusty/build.sh @@ -34,4 +34,5 @@ dch --release '' dpkg-buildpackage -uc -b -tc +mkdir /dist mv ../*.deb /dist