From patchwork Tue Mar 20 22:34:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 888467 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 405SRQ40R4z9s0v for ; Wed, 21 Mar 2018 09:34:42 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b="Cl50nqsc"; dkim-atps=neutral Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 405SRQ25N2zF1XB for ; Wed, 21 Mar 2018 09:34:42 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b="Cl50nqsc"; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=axtens.net (client-ip=2a00:1450:400c:c09::230; helo=mail-wm0-x230.google.com; envelope-from=dja@axtens.net; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=axtens.net Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b="Cl50nqsc"; dkim-atps=neutral Received: from mail-wm0-x230.google.com (mail-wm0-x230.google.com [IPv6:2a00:1450:400c:c09::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 405SRF2MtXzF0xD for ; Wed, 21 Mar 2018 09:34:32 +1100 (AEDT) Received: by mail-wm0-x230.google.com with SMTP id x82so6468330wmg.1 for ; Tue, 20 Mar 2018 15:34:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id; bh=4RB8zi1ySebNGNeW8VRZlq3TmL8fbZDT6W8LeHuZhfE=; b=Cl50nqscvPomAnPOUnaz+S3NKYZeJILiqUJR/EgxV1NV/1w77EUoOkZ7sOrcoDkUap w+wdyMdMDTidI/jjUrtitvTvRFGg5XVTetK2cYX3QRei26cBYWsrEwna3lYBRxiJr2TL /EP9hoZlSUamzqFqA8XC0tAKciaHkX0PSFjvE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4RB8zi1ySebNGNeW8VRZlq3TmL8fbZDT6W8LeHuZhfE=; b=WkI5pFdgkNHPymCjhIELd+c69Hpd16rSINEPsUfmPdON92vMrXq9j1f/nKPg2+pCt1 CUiBUocdn6ikU/Hy0V3DoRFRBmC1fmuxlBAb15bxPW1ArAApNtA5gksnGwl8M93s9pov lZuFOK1hh0ACgfhxo73eMWQmbCh3lKP0zfmF0hfYbfIE36fD7EX1z9QezRoG01ql6WNG 1WIZH2cNmBmZK2MyJwGiENDaNmXl/yLRa4KJKkrB86fvyP7zBDVrsCBiVkpUYQ8QcmaI wqk/MKDEVCEk5jDAbtCYjDm5rD3AP4nGpDRf09cLd4yW0jj0lLHwcDctRweJoRknWM1y TOqg== X-Gm-Message-State: AElRT7EGv1pKWpRnL108+Zmb4n5K1ulclKli8+sKzin5cs93tK2z/0fx 1qB+fHVdefFJF0u7zsYJkGDIug0LUDY= X-Google-Smtp-Source: AG47ELuFBi92kqPrx45ii5/vzzBpk/kyiKtk995YkTxuFTO4xNTlF+oknjyQnM1gZCQns+q4pnbe7A== X-Received: by 10.28.101.6 with SMTP id z6mr733527wmb.110.1521585268779; Tue, 20 Mar 2018 15:34:28 -0700 (PDT) Received: from linkitivity.nonius.hsia ([88.157.201.114]) by smtp.gmail.com with ESMTPSA id g38sm4262172wra.77.2018.03.20.15.34.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Mar 2018 15:34:28 -0700 (PDT) From: Daniel Axtens To: patchwork@lists.ozlabs.org Subject: [PATCH] docker: set timezone to Australia/Canberra Date: Wed, 21 Mar 2018 09:34:15 +1100 Message-Id: <20180320223415.26623-1-dja@axtens.net> X-Mailer: git-send-email 2.14.1 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" The tzinfo package isn't installed in docker, which makes the default timezone UTC. This is unfortunate: the Django TZ in settings/base.py is Australia/Canberra, and having a non-UTC TZ is good for exposing faulty assumptions about what is and isn't UTC. Signed-off-by: Daniel Axtens Reviewed-by: Stephen Finucane --- tools/docker/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index eb6d35d82528..31b2aaeedf49 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,6 +1,7 @@ FROM ubuntu:17.10 ARG UID=1000 +ARG TZ="Australia/Canberra" ENV PROJECT_HOME /home/patchwork/patchwork @@ -22,12 +23,15 @@ RUN apt-get update -qq && \ python3.5-dev python3-pip python3-setuptools python3-wheel \ python3.4-dev findutils=4.4.2-7 python3.6-dev \ libmysqlclient-dev mysql-client curl unzip xvfb chromium-chromedriver \ - chromium-browser build-essential git postgresql-client && \ + chromium-browser build-essential git postgresql-client tzdata && \ ln -s /usr/lib/chromium-browser/chromedriver /usr/bin/ # User RUN useradd --uid=$UID --create-home patchwork +# Timezone +RUN rm /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime + # Python requirements. # If you update requirements, you should rebuild the container. # entrypoint.sh will prompt you to do this.