From patchwork Sat Jul 6 20:25:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 1128535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45h3BM2nMMz9s3l for ; Sun, 7 Jul 2019 06:25:47 +1000 (AEST) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="c+nMii8x"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 45h3BL3Cq4zDqWK for ; Sun, 7 Jul 2019 06:25:46 +1000 (AEST) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=none (mailfrom) smtp.mailfrom=that.guru (client-ip=199.181.239.200; helo=relay0200.mxlogin.com; envelope-from=stephen@that.guru; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=that.guru Authentication-Results: lists.ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; unprotected) header.d=that.guru header.i=@that.guru header.b="c+nMii8x"; dkim-atps=neutral Received: from relay0200.mxlogin.com (relay0200.mxlogin.com [199.181.239.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 45h3BC4TdjzDqW3 for ; Sun, 7 Jul 2019 06:25:38 +1000 (AEST) Received: from filter002.mxroute.com (unknown [94.130.183.33]) by relay0200.mxlogin.com (Postfix) with ESMTP id 898F0CCB0305; Sat, 6 Jul 2019 15:25:36 -0500 (CDT) Received: from one.mxroute.com (one.mxroute.com [195.201.59.211]) by filter002.mxroute.com (Postfix) with ESMTPS id BBE833F2C2; Sat, 6 Jul 2019 20:25:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=that.guru; s=default; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject: Cc:To:From:Sender:Reply-To:Content-Type:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Zt0AnmcCZVTOi8ARMaHuBWAeK2tvS8rEulnZSa97CHk=; b=c+nMii8xVNcwIDxyrasPBwDhMb Ua8j7EKEDsUh8Bw3uXFQwSl2PsL5VGi270ZcNV6fblIFkOIO2xuJST488sqZVXxAJtqfv1iA6Ki0G Vzut/0suJzY1H7LmP8xkQlTKfeF6YPR1LhvVggtP5KYDVOS8ue4u2X5pEyRimC0WMLn8IIoUfhBNO CkIqzNbDcrQRMuhas9QA1UR4yDBGdqPv0l8iJfL0ztykt9s3ozK1b3aoOJjogCrfpA9V3HnrUFEXk KKTCl83TYGclCBvOTx7NR1EgkL63L41mJPjnt5cEmL3UKZJtMeZle8HtUbjI6T2xRuWcMwg+S3NSI 65UktDIw==; From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH] docker: *Actually* don't require rebuilding if unnecessary Date: Sat, 6 Jul 2019 21:25:25 +0100 Message-Id: <20190706202525.12707-1-stephen@that.guru> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-AuthUser: stephen@that.guru X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Because we were using 'set -e', we were erroring out as soon as something - a diff in this case - failed. Temporarily disable it for this one check. Signed-off-by: Stephen Finucane Fixes: 0b5b4e8c ("docker: Don't require rebuilding if unnecessary") Cc: Daniel Axtens --- tools/docker/entrypoint.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/docker/entrypoint.sh b/tools/docker/entrypoint.sh index 32f7132a..d2b094bd 100755 --- a/tools/docker/entrypoint.sh +++ b/tools/docker/entrypoint.sh @@ -67,6 +67,8 @@ EOF exit 1 fi +set +e + # check if we need to rebuild because requirements changed for x in /tmp/requirements-*.txt; do if ! cmp $x ~/patchwork/$(basename $x); then @@ -81,6 +83,8 @@ EOF fi done +set -e + # check if db is connected if ! test_db_connection; then echo "The database seems not to be connected, or the patchwork user is broken"