From patchwork Sun Dec 12 06:17:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: You-Sheng Yang X-Patchwork-Id: 1566975 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=OpvBTM4S; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4JBZFS2pLjz9sCD for ; Sun, 12 Dec 2021 17:18:03 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JBZFG0Ph4z3c73 for ; Sun, 12 Dec 2021 17:17:54 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=OpvBTM4S; dkim-atps=neutral X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::102e; helo=mail-pj1-x102e.google.com; envelope-from=vicamo@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=OpvBTM4S; dkim-atps=neutral Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JBZF93bS9z304w for ; Sun, 12 Dec 2021 17:17:47 +1100 (AEDT) Received: by mail-pj1-x102e.google.com with SMTP id np6-20020a17090b4c4600b001a90b011e06so10772950pjb.5 for ; Sat, 11 Dec 2021 22:17:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xQ+92eUYlLEIvata2L2EZMxq2jql9X5K1ONnwDufM44=; b=OpvBTM4SNU6Lo7aN0Gz0la7KdggRhNJz4beY9oZjy2rBbI4PkJfZG4c3OSfvvOVrSU 1drbEY+bhTEj/FRFhfNMJPkomHHNqv0oLpFlkCEilqnpTO97y+TbWg4n6oMGCWqxtS2Y YUaH9u8OYM9ih8yWMuGcj1Pae6D9P3pZ59M0V2c5xgNda5tMOPlduaA16KbJh9p/qr+t ZV91DLOHLlHUj+IHTa0M14cBP6V3ljGsljSfTVC5QAfQqvvCbcAVBb9/z1JdJGq9MnTl I6kwVdo4mpimGSE4Fm1uWSt28yrQ4G+leLB8055jHp+S67MpYzTt0VcVmQ2+o3Hq0GGa 0Pqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xQ+92eUYlLEIvata2L2EZMxq2jql9X5K1ONnwDufM44=; b=RwnJQPGEmMzgCRMdoFPrXEs36sZkhPoZBnjVxv6AtAKzfw9XtxFMtZ/c7PuHqtPQBd pi/PmHZwQrg4BpZmw2+nOFwuCKlIPHka00Xixb+YipNhAn2IwNXB6v9Gus9qP7/PPAzR brgMdGrYwvkdMgwyiXCDbh4YusxXz0ECdYVxR/TG3mNtGUKUq4oGAK4JLNZoT3WyqU8A K68IF8U6sOMv+0SWpXZ2nLDoPuSL42dNDS6lo88x7mZaHm4t2hMmJ/8dyxZnEzfV9D69 MRDj49ol+UfugtYk1BHpKncTAcAZPSFBh7DKlvYGU9VPB8EtHV2i6rnXnWKEqtGgIEf6 W+BA== X-Gm-Message-State: AOAM530TqMXCAdUcByzCiMb9C6Hg5PV2Wod8FkXGEWKtPFoZ+C7WYfhl F/R9b8RKw+GsC/BQCG+pmlpw2avIepw= X-Google-Smtp-Source: ABdhPJzLhawMQj5dAauCM5wdFwg/omAweY9nCENsklFqVFIP5rUt5GUU1H2WF4YzBXKZ1YKVie6YfQ== X-Received: by 2002:a17:90b:1812:: with SMTP id lw18mr35921393pjb.196.1639289862871; Sat, 11 Dec 2021 22:17:42 -0800 (PST) Received: from localhost (218-173-164-169.dynamic-ip.hinet.net. [218.173.164.169]) by smtp.gmail.com with ESMTPSA id f21sm8370881pfc.191.2021.12.11.22.17.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Dec 2021 22:17:42 -0800 (PST) From: You-Sheng Yang To: patchwork@lists.ozlabs.org Subject: [PATCH] docker: rebase on vicamo/pyenv Date: Sun, 12 Dec 2021 14:17:40 +0800 Message-Id: <20211212061740.3015597-1-vicamo@gmail.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 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" Rebuild pyenv environments can be time-consuming and irrelevant to this project. Use a prebuild image to save some time here. Signed-off-by: You-Sheng Yang --- tools/docker/Dockerfile | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index d9d0905..821ad37 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:18.04 +FROM vicamo/pyenv:latest-bionic ARG UID ARG GID @@ -10,11 +10,6 @@ RUN echo $UID; echo $GID; \ [ -n "$GID" ] || { echo "You must define GID in .env" 1>&2; exit 1; } ARG TZ="Australia/Canberra" -ENV LANG="C.UTF-8" -ENV LC_ALL="C.UTF-8" -ENV PATH="/opt/pyenv/shims:/opt/pyenv/bin:$PATH" -ENV PYENV_ROOT="/opt/pyenv" -ENV PYENV_SHELL="bash" ENV DEBIAN_FRONTEND noninteractive ENV PYTHONUNBUFFERED 1 ENV PROJECT_HOME /home/patchwork/patchwork @@ -25,34 +20,15 @@ RUN groupadd --gid=$GID patchwork && \ RUN rm -f /etc/localtime; ln -s /usr/share/zoneinfo/$TZ /etc/localtime RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - curl \ - git \ - libbz2-dev \ - libffi-dev \ libmysqlclient-dev \ libpq-dev \ - libreadline-dev \ libsqlite3-dev \ - libssl-dev \ mysql-client \ postgresql-client \ sqlite3 \ tzdata \ - zlib1g-dev \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* -RUN curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash && \ - git clone https://github.com/momo-lab/xxenv-latest $PYENV_ROOT/plugins/xxenv-latest && \ - pyenv update - -RUN pyenv latest install 3.6 && \ - pyenv latest install 3.7 && \ - pyenv latest install 3.8 && \ - pyenv latest install 3.9 -RUN pyenv global $(pyenv versions --bare | tac) - RUN pip install tox tox-pyenv # we deliberately leave the requirements files in /opt so we can ping the user