From patchwork Fri Aug 26 06:55:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 662999 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sLBfD0nTXz9sBg for ; Fri, 26 Aug 2016 16:56:20 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=p3+WQ/JO; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sLBfC6fb0zDrdF for ; Fri, 26 Aug 2016 16:56:19 +1000 (AEST) 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=p3+WQ/JO; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (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 3sLBf55jWczDqB7 for ; Fri, 26 Aug 2016 16:56:12 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=axtens.net header.i=@axtens.net header.b=p3+WQ/JO; dkim-atps=neutral Received: by mail-pf0-x242.google.com with SMTP id i6so4438400pfe.0 for ; Thu, 25 Aug 2016 23:56:12 -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=7ZJzE7A7TrlifboP0HcKnG4sggIzNR+9ZcyTClZKbOg=; b=p3+WQ/JOmPG+/9gKso3l3tae9LmVJKoec4TyqL3/ENS1dZrvhJq9p0rZ3V0EKbWdCC GNve53gXgA1eVJOlXCksx7xhNrNgHxV/UwM4jQnpX1eZBcnQpMQprjtM7Ddu3fJzMC1W u5y9G8sRponuOTagz5q8Fz7FnmH6w1hG45vW8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=7ZJzE7A7TrlifboP0HcKnG4sggIzNR+9ZcyTClZKbOg=; b=fuBhmaGN+nFqNvFC759h56dWjSLkRTo4BL2MU/BK7GhnIuTTkdxb5LDqNsS+EE8RrC qe6JOMEKEAltfE2iYPbWzS2iSdXHqaWZWrQSx/XF2wIoXGtb19xqOd4v+/N4S9LtzIWj lVBaCdn7s97yrScDZwnj6W0Aqk6ZX+QLB/mrc+vuTMDz+MRcwbUdU4EwZdu81rwg+dvQ 4jRVg+mQ9MF2b2LOqVwHvu1PhL8KDFylTqMilB4FXizzJ0GUY3Yfzva3KQmqwGUz6PrZ lrFE7m723E1qkIO+KWb3Z06QjzqSE5p4EjjiHaog3HQxrOBZDsUD+q05wxtb/HH73QEd gI6g== X-Gm-Message-State: AE9vXwMBFxg7cTRMXSP6IWMJpFP0ksCCIHskbeP4YCuZgATFaw+6nnAH6y+g3UVmXRSTUQ== X-Received: by 10.98.9.194 with SMTP id 63mr3243254pfj.56.1472194570196; Thu, 25 Aug 2016 23:56:10 -0700 (PDT) Received: from possimpible.ozlabs.ibm.com (ppp121-45-195-151.lns20.cbr1.internode.on.net. [121.45.195.151]) by smtp.gmail.com with ESMTPSA id c82sm25554522pfb.72.2016.08.25.23.56.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 25 Aug 2016 23:56:09 -0700 (PDT) From: Daniel Axtens To: patchwork@lists.ozlabs.org Subject: [PATCH] Install Python 3.4 in Docker Date: Fri, 26 Aug 2016 16:55:59 +1000 Message-Id: <1472194559-7631-1-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.7.4 X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.22 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" Currently, we tox test against Python 3.4. Python 3.4 is included with Ubuntu 14.04, which is supported for several years to come, so we want to keep supporting it. However, Python 3.4 isn't included with Ubuntu 16.04, which is what the Docker image is based on. We could downgrade the container to 14.04, but then we'd struggle to get Python 3.5 into the container. Python 3.5 is the most recent in the Python 3 series, so we should also be supporting it. Add the apt sources for Trusty and pull in Python 3.4 from there. Signed-off-by: Daniel Axtens Reviewed-by: Stephen Finucane --- This is a bit hacky, but I can't think of anything much better. If I downgrade to 14.04, you'd need to go through something similar for 3.5. We could download and build from source, but that seems even worse. --- docker/Dockerfile | 8 ++++++-- docker/trusty.list | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 docker/trusty.list diff --git a/docker/Dockerfile b/docker/Dockerfile index ea2a8fc5ab77..77a3a19c4800 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,10 +12,14 @@ ENV DEBIAN_FRONTEND noninteractive ENV PYTHONUNBUFFERED 1 # System +# python3.4-minimal libpython3.4-stdlib libpython3.4-minimal \ +# findutils is for python3.4... :/ +COPY docker/trusty.list /etc/apt/sources.list.d/trusty.list RUN apt-get update -qq && \ - apt-get install -y --no-install-recommends \ + apt-get install -y --no-install-recommends --allow-downgrades \ python-dev python-pip python-setuptools python-wheel \ - python3-dev python3-pip python3-setuptools python3-wheel \ + python3.5-dev python3-pip python3-setuptools python3-wheel \ + python3.4-dev findutils=4.4.2-7 \ libmysqlclient-dev mysql-client curl unzip xvfb chromium-chromedriver \ chromium-browser build-essential && \ ln -s /usr/lib/chromium-browser/chromedriver /usr/bin/ diff --git a/docker/trusty.list b/docker/trusty.list new file mode 100644 index 000000000000..8bb92c09a71f --- /dev/null +++ b/docker/trusty.list @@ -0,0 +1,3 @@ +deb http://archive.ubuntu.com/ubuntu/ trusty main +deb http://archive.ubuntu.com/ubuntu/ trusty-updates main +deb http://security.ubuntu.com/ubuntu trusty-security main