From patchwork Sun May 17 21:41:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 1292264 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=free.fr Authentication-Results: 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=20161025 header.b=EQt6g5rH; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49QFwK41d0z9sTT for ; Mon, 18 May 2020 07:41:53 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 12EEE20531; Sun, 17 May 2020 21:41:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zfTOFzJbGSyl; Sun, 17 May 2020 21:41:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D3E2E203DE; Sun, 17 May 2020 21:41:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A486F1BF2B7 for ; Sun, 17 May 2020 21:41:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A155C8809E for ; Sun, 17 May 2020 21:41:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5TP9fTXefNSd for ; Sun, 17 May 2020 21:41:44 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by hemlock.osuosl.org (Postfix) with ESMTPS id B4DFC87F48 for ; Sun, 17 May 2020 21:41:43 +0000 (UTC) Received: by mail-wm1-f53.google.com with SMTP id d207so18049476wmd.0 for ; Sun, 17 May 2020 14:41:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+BJW19RIAnn/+XtHXKK88v1yMux9al+8zFtR4FuxZT0=; b=EQt6g5rHN8AuK4pBnWJcc3EEGy+2D8Lju7H9fIojx8OepEAKlv3/8BlzvCQ+ohOizj rcVP9W6rdQ177mLcK3/c+EZvr3yuCOy8nCRKRbeChz3SRrOdyOQ63+omZyNUqU5ZfK0P GkceRerYFbv4DGx/VLmHhnaUoWkoELU2+Uc/tpfQM7ZlUN0cXezUJyXMg2ZysR03VOE1 wxkOSse3pBrn1sUqWbUuFxZkwgU+a3xTP9f1Wy4YZ5hp/EofBn8KgHUQhE9uGZ0kYmbU MRYKTTaLPo6lOzP990qc9OBP8eH5uze66MPngBoRDZ7yKovv1UfuYxEJaJ3IE4LXdU6H +Juw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+BJW19RIAnn/+XtHXKK88v1yMux9al+8zFtR4FuxZT0=; b=UJz/wCt7ehoW7iRP5Shg5FTn5ygP305Rw5OEB7O7GKyZRJ/rHMKxM3ltDWmLzhuH52 E0WY0i5J8ijXs5lB91SIBgHMAEExmkRxtmwN9HojFOFVN1fFeqn6fThI1cx49dIGjOv+ ylnD+cRWGEhjfUPJ1HBUNW+3avfeeaHk1+Qx5L3viuL8eICzD3jU0zn1SMLxVLmE42HV Lx8D6CcQm2Tgw2rm/RioKNjZiMNGZwYXw/8UqmcnHbGGUpXQquUuG1C+QoPln5N+5icB APj4QDmp61gHw8vN7ksY2LilNC7dnG6bRpgT2TvLYXNSQ406Ps6BEkHFxMeDTDlWRUDK Y6Eg== X-Gm-Message-State: AOAM533QimQI5//aEkoXAsJ9T+KvJ2GIW6kbMBRzU/y/k+MRvTPEsDlo xHD9dJuX09BwETWzKt3AG7LKBgTZ X-Google-Smtp-Source: ABdhPJyLy6MwoPswOR1XvLZlkyNsNUz9wf8mOOzRpYqQJd7XcsH8MeWJqCfdUXi/tgYyXkzAU20a4Q== X-Received: by 2002:a05:600c:14d4:: with SMTP id i20mr15751478wmh.74.1589751701926; Sun, 17 May 2020 14:41:41 -0700 (PDT) Received: from scaer.home ([2a01:cb19:8b51:cb00:9dd9:6f89:4087:b3eb]) by smtp.gmail.com with ESMTPSA id h20sm13455682wma.6.2020.05.17.14.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 14:41:41 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sun, 17 May 2020 23:41:37 +0200 Message-Id: <88b63f759c190f6f3bfd4716b76d608284a5291f.1589751688.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.20.1 In-Reply-To: References: MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/4 v2] support/docker: rename the Dockerfile and its accompanying file X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Petazzoni , "Yann E. MORIN" , Ricardo Martincoski Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Currently, we only generate one docker image, for use by the gitlab-ci infra. However, users have expressed an interest in using that image for other uses, like: - reproducing build failures as reported by the gitlab-ci jobs; - having a ready-to-use base image to use as-is, or as a template for further customisations. Additionally, some users have reported the need for similar base images, but based off different distros, with the same goals as above, plus: - reproducing build failures reported by users on other distros. As a first step toward providing such images, rename our Dockerfile to include the name and version of the distro it is based off. We add a symlink so that we still have a 'base' image that we can reference from the gitlab-ci infra. Signed-off-by: "Yann E. MORIN" Cc: Ricardo Martincoski Cc: Thomas Petazzoni Reviewed-by: Romain Naour --- support/docker/Dockerfile.base | 1 + support/docker/{Dockerfile => Dockerfile.debian-stretch} | 7 +++++-- .../{apt-sources.list => debian-stretch.apt-sources.list} | 0 3 files changed, 6 insertions(+), 2 deletions(-) create mode 120000 support/docker/Dockerfile.base rename support/docker/{Dockerfile => Dockerfile.debian-stretch} (88%) rename support/docker/{apt-sources.list => debian-stretch.apt-sources.list} (100%) diff --git a/support/docker/Dockerfile.base b/support/docker/Dockerfile.base new file mode 120000 index 0000000000..06a988b45e --- /dev/null +++ b/support/docker/Dockerfile.base @@ -0,0 +1 @@ +Dockerfile.debian-stretch \ No newline at end of file diff --git a/support/docker/Dockerfile b/support/docker/Dockerfile.debian-stretch similarity index 88% rename from support/docker/Dockerfile rename to support/docker/Dockerfile.debian-stretch index 03acde85d2..0d2ce2aa79 100644 --- a/support/docker/Dockerfile +++ b/support/docker/Dockerfile.debian-stretch @@ -1,6 +1,9 @@ +# vi: ft=dockerfile # This Dockerfile generates the docker image that gets used by Gitlab CI # To build it (YYYYMMDD.HHMM is the current date and time in UTC): -# sudo docker build -t buildroot/base:YYYYMMDD.HHMM support/docker +# sudo docker build -t buildroot/base:YYYYMMDD.HHMM \ +# -f support/docker/Dockerfile.debian-stretch \ +# support/docker # sudo docker push buildroot/base:YYYYMMDD.HHMM # We use a specific tag for the base image *and* the corresponding date @@ -16,7 +19,7 @@ description="Container with everything needed to run Buildroot" ENV DEBIAN_FRONTEND noninteractive # This repository can be a bit slow at times. Don't panic... -COPY apt-sources.list /etc/apt/sources.list +COPY debian-stretch.apt-sources.list /etc/apt/sources.list # The container has no package lists, so need to update first RUN dpkg --add-architecture i386 && \ diff --git a/support/docker/apt-sources.list b/support/docker/debian-stretch.apt-sources.list similarity index 100% rename from support/docker/apt-sources.list rename to support/docker/debian-stretch.apt-sources.list