From patchwork Mon Jan 15 17:56:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37863 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98D90C47258 for ; Mon, 15 Jan 2024 17:56:42 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.89705.1705341399690264597 for ; Mon, 15 Jan 2024 09:56:39 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=dyMzfROO; spf=pass (domain: gmail.com, ip: 209.85.210.172, mailfrom: ticotimo@gmail.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-6dad22e13dcso5488969b3a.3 for ; Mon, 15 Jan 2024 09:56:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341399; x=1705946199; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LssExPjnJeSIUbBmgIQy2Yh1hS2ido5qZdpc7MmHXcE=; b=dyMzfROO7ZPar4AMLM2f2bYGJL+hA9NewzDl0s29tgeeKQ08PRX0q3RhPO9bjeExLB ra2qIhgJtbwqQMq4aMjKW3/3h7PwEIJFW4zIsDEjhZnULXnKXE9C6A9ELerEiNqKbc8I PyrNzDduFe0Vv2afE5t7onQhtuRGzqZxRkY79JADQlKjv2/2EfvLh3BvEub0MLgK289i 1tO/Gp8UTCtXUCwKlUPOIGK6btpujPuOEpeyDqGChVqVtEuAopceGOL/a1lcWCq01sdt a4We3sNHrLR7slgt4Lchordd/XmJhk9+ZkGbyf5TcTOdVCJQpYs/y12NVUOWTnZ9v8kT 1z5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341399; x=1705946199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LssExPjnJeSIUbBmgIQy2Yh1hS2ido5qZdpc7MmHXcE=; b=v7p5ZT7o6/gfQffqq5XP5ciBaRpXr+RM9x7TOPdGdOacPs1CAaucLOOrv6oa3dWAEv B0Kktd89pB643UsB79uj1MaSNbOiCs00hjN15Rz4GNoFrugxtmorkeaaB1jIt9F42TXY Uvd5Mh+66CXkcOqDmTz3DuPQGh9ja6MCWs6/pDEL8rQXngn9HbKCxMk5n8bvbZBpHIaG e9aoGwACHZ4DIlVwSaqNJsK3AucxA5UzVRbTQrzIyY08IpW4DdSq8A6tmlAkjwENbgni GSLf46aXOLXz9ArFBtx26YoGuLXGQf4u/7T5kIrnUJO+iED0h751prZDAYJhKC+uNaaP U89A== X-Gm-Message-State: AOJu0YwB+mdcQb1kZ9c3E1fW8OYB3aY1Gl3Fxa+M+d2jVhz6qOEBaxwI bA5WJTaGmZcxJriOgCFGaOeE/x/hoI4= X-Google-Smtp-Source: AGHT+IHBIllJDq4rba8bpyEJsYeKCA8LUQOYkLWKQNDzAYwq37vBiNW1wEbThBFvBtKjvFZGjlephw== X-Received: by 2002:a05:6a20:ce4d:b0:19a:8556:8caa with SMTP id id13-20020a056a20ce4d00b0019a85568caamr3153653pzb.13.1705341398783; Mon, 15 Jan 2024 09:56:38 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f7cc00b001d59432a29csm6282455plw.282.2024.01.15.09.56.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:56:38 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 1/6] dockersetup: use .zst not .zstd Date: Mon, 15 Jan 2024 09:56:27 -0800 Message-Id: <98ae2206b5afa5df0d23d4da9cd49fdf84faae55.1705341088.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:56:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62147 The default file extension for zstd compression is .zst Signed-off-by: Tim Orling --- dockersetup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dockersetup.py b/dockersetup.py index 56458d3..21be0da 100755 --- a/dockersetup.py +++ b/dockersetup.py @@ -54,7 +54,7 @@ def get_args(): parser.add_argument('-s', '--https-proxy', type=str, help='https proxy in the format http://', default=default_https_proxy, required=False) parser.add_argument('-S', '--socks-proxy', type=str, help='socks proxy in the format socks://myproxy:port>', default=default_socks_proxy, required=False) parser.add_argument('-N', '--no-proxy', type=str, help='Comma-separated list of hosts that should not be connected to via the proxy', default=default_no_proxy, required=False) - parser.add_argument('-d', '--databasefile', type=str, help='Location of your database file to import. Must be a .sql, .sql.gz or .sql.zstd file.', required=False) + parser.add_argument('-d', '--databasefile', type=str, help='Location of your database file to import. Must be a .sql, .sql.gz or .sql.zst file.', required=False) parser.add_argument('-e', '--email-host', type=str, help='Email host for sending messages (optionally with :port if not 25)', required=False) parser.add_argument('--email-user', type=str, help='User name to use when connecting to email host', required=False) parser.add_argument('--email-password', type=str, help='Password to use when connecting to email host', required=False) @@ -808,7 +808,7 @@ if not args.update: # Import the user's supplied data if args.databasefile: filename, file_extension = os.path.splitext(args.databasefile) - if file_extension == ".zstd": + if file_extension == ".zst": return_code = subprocess.call("zstd -t %s > /dev/null 2>&1" % quote(args.databasefile), shell=True) if return_code == 0: catcmd = 'zstdcat' From patchwork Mon Jan 15 17:56:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37864 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E430C3DA79 for ; Mon, 15 Jan 2024 17:56:42 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web10.89706.1705341401067185080 for ; Mon, 15 Jan 2024 09:56:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZOhPx5h3; spf=pass (domain: gmail.com, ip: 209.85.214.176, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d3f3ee00a2so41995435ad.3 for ; Mon, 15 Jan 2024 09:56:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341400; x=1705946200; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=eEyEFcy5omVt9mfQnChEcdORd5gsPawJU/i8UH/4pD4=; b=ZOhPx5h3lZ7JYxMlgZJYP0xz2E3L2As1v1DwEtbaCHCfkZS2vOslCSg7dOk8OuFuzH gg/MKYe6+0+wbsTPR4L6cbCJKgPzVO8tFRYJ81BWOEiQDhkVME0NzGRLA5tcmN1rCJkv yueSIhSmxqEq0E2M8sCmzKwv8qPOSdnvLo7bDYSf08m4Jwmha0KUVxcZGL2Lg/WSla2K ZBZaG9hb2pul61PbZBCuOC2iadk2kYR1X7bq8FJRFvon4skzEb7cJ1blv8/5uxT2BEdj B52thkqKeo2sETwg5CpMlkfDOta5vgNocR0pT+60uwSc0xOcrd2PEd+2+wU+heR7tXEp qnkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341400; x=1705946200; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eEyEFcy5omVt9mfQnChEcdORd5gsPawJU/i8UH/4pD4=; b=nDVhdPGvoA2k/o8TwVT7ZacR6nozxTCif8ClsT68oOXK/5j46qZhc4/0KivZQnRQLm YejTJ/6laCDNtbnaD0VdEFWLufVsNWgikxZSuV3l96Ev8OLJUJVAebQ8stkwsNs2zH1t dAIAiyMLb6L8YCRVtBGaFf3Qbq3FOZqzgE/2sRdZ69BM/jaD5hQVUNigei64VhImJRnu q0KrHKskzySMG0oNlnj1NmMtu00EZNjlf2uGN7HC2zLno9MqssEDEFWJkqQ4ZlNK+RZs L5d3SwFLGY7EWCBgG06xarElc0agZXpBPax3I/gLKTGJ7/awd5b2UeY89JKaRohkJw8j avIQ== X-Gm-Message-State: AOJu0Yz4BSML5O2Z7KjnXRSw0xBvNtxuUVtTWzk2S1UgzRJPc8jRB+9j ueSiMDbb9vpr6JPjDwpsV2O0X3307C8= X-Google-Smtp-Source: AGHT+IFNthAdtgX3YWQ/igFHbLh0eoW34TwQMQZnJthgfOmkDBQOByDTZr/nhP9Ng6jbg3nMs96k6Q== X-Received: by 2002:a17:902:7849:b0:1d4:e276:61c0 with SMTP id e9-20020a170902784900b001d4e27661c0mr2787132pln.92.1705341400283; Mon, 15 Jan 2024 09:56:40 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f7cc00b001d59432a29csm6282455plw.282.2024.01.15.09.56.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:56:40 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 2/6] Dockerfile: sort apt packages alphabetically Date: Mon, 15 Jan 2024 09:56:28 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:56:42 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62148 Make it is a bit easier to see what is installed by sorting the package list alphabetically. Signed-off-by: Tim Orling --- Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02948b6..0f3afc4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,26 +23,26 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ && update-locale \ && apt-get install -y --no-install-recommends \ autoconf \ + cpio \ + curl \ g++ \ gcc \ - make \ - python2 \ - python3-pip \ - python3-mysqldb \ - python3-dev \ - python3-wheel \ - zlib1g-dev \ + git \ libfreetype6-dev \ libjpeg-dev \ libmariadb-dev-compat \ + make \ netcat-openbsd \ - curl \ - wget \ - git \ - vim \ - rpm2cpio \ + python2 \ + python3-dev \ + python3-mysqldb \ + python3-pip \ + python3-wheel \ rpm \ - cpio \ + rpm2cpio \ + vim \ + wget \ + zlib1g-dev \ && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ && locale-gen en_US.UTF-8 \ && update-locale \ From patchwork Mon Jan 15 17:56:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37865 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8817AC47258 for ; Mon, 15 Jan 2024 17:56:52 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web11.89157.1705341402686184756 for ; Mon, 15 Jan 2024 09:56:42 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=BNNt8khZ; spf=pass (domain: gmail.com, ip: 209.85.214.175, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1d50d0c98c3so64941125ad.1 for ; Mon, 15 Jan 2024 09:56:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341402; x=1705946202; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dLvRV8cc6tgOHIny4mjgr2UIZzc9Nd76E4bhIB4jEV4=; b=BNNt8khZaKlZppfkHWDZQnamjvym3OBkfc7VqHNGQ3C3tYtM4tTukjyPGuoF2diaC6 Ol/ZV8WiwelDKZCuqj6N+R6UpqHlg/oEeyOWyo3WZop/5e31Im/KmWhrXLteaMAf666u XkSreqPB3fcmTwa0TYitBSm4jO0HKtHjH4XMNNIhQrGhtCAcW3QWO7P84aqDz9UcZpL7 qwNJxIjCrJe/23awAeQMhUycS+UNsocUGR2Kge8pJOcEh5dGT/SFEBX86XyYazPCpn0N jZCN7AfPbNCq6bds+sT3Wcyl81/yfoUhmE5pE0R8188W2Z0aXfeMzEFa4SewpJ7RNupH lwMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341402; x=1705946202; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dLvRV8cc6tgOHIny4mjgr2UIZzc9Nd76E4bhIB4jEV4=; b=Sm/serknHnM2ockXQNlcvKU5Y59gT9osnoaXPjSIJIoQbJui44rHzzYtuFYGVqQJ50 0MITR/C4b/Cw7zwrZU7698ImYBgHX8MQ9U1JVBKGG1WkOEVaIn8td90+y9EqluAVrXMs XnKPxt3u2rGbgz7qCL0CATw3T3CQ6sBjRybXH+FqHJbmo46UYyL2a49Q55Z6IEuzWH0p VVlk+C9xma7nsWbqxS9R+TDV2YXIaPGs5f6S41LKbHfmXXXVfgyxrKhEdxI+lyXASHp6 9z4L/xke+8c9a/uqM+C38Ut59vnnKRd7M6D1NrfFiUPXloM34XsTLMlaAOfRUakjjkOp zRIg== X-Gm-Message-State: AOJu0YzqamXe1prxEQiOo87gdFJD82NEhlZb/Yeukak+smriwv+A5nmL 46XZdd5qz0Jsar9aWTQpEOClp1kR4ps= X-Google-Smtp-Source: AGHT+IGUaimQkWEKVX6jLfpIe4Tr0ASN9AOzrXSMKRT3CdwvXsoC9Kd27UO+fUQyy41Mw6KvHbsrrA== X-Received: by 2002:a17:902:fe0c:b0:1d3:3b14:b765 with SMTP id g12-20020a170902fe0c00b001d33b14b765mr6636747plj.69.1705341401767; Mon, 15 Jan 2024 09:56:41 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f7cc00b001d59432a29csm6282455plw.282.2024.01.15.09.56.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:56:41 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 3/6] Dockerfile: fix mysqlclient==2.2.1 build Date: Mon, 15 Jan 2024 09:56:29 -0800 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:56:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62149 To build mysqlclient==2.2.1 we need to add default-libmysqlclient-dev and pkg-config Drop conflicting libmariadb-dev-compat Drop python3-mysqldb to allow requirements.txt to override version Upgrade pip and setuptools before installing from requirements.txt as newer versions are required to properly build mysqlclient wheel. Signed-off-by: Tim Orling --- Dockerfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0f3afc4..72f57d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,12 +30,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ git \ libfreetype6-dev \ libjpeg-dev \ - libmariadb-dev-compat \ + default-libmysqlclient-dev \ make \ netcat-openbsd \ + pkg-config \ python2 \ python3-dev \ - python3-mysqldb \ python3-pip \ python3-wheel \ rpm \ @@ -46,10 +46,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ && echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen \ && locale-gen en_US.UTF-8 \ && update-locale \ + && pip3 install pip --upgrade \ + && pip3 install setuptools --upgrade \ && pip3 install gunicorn \ - && pip3 install setuptools \ && pip3 install -r /requirements.txt \ - && apt-get purge -y autoconf g++ make python3-dev libjpeg-dev \ + && apt-get purge -y autoconf g++ make python3-dev pkg-config libjpeg-dev \ && apt-get autoremove -y \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean From patchwork Mon Jan 15 17:56:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37866 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 88108C3DA79 for ; Mon, 15 Jan 2024 17:56:52 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web10.89709.1705341404129298884 for ; Mon, 15 Jan 2024 09:56:44 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=TZ4cQIHg; spf=pass (domain: gmail.com, ip: 209.85.215.179, mailfrom: ticotimo@gmail.com) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-5c6bd3100fcso3793543a12.3 for ; Mon, 15 Jan 2024 09:56:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341403; x=1705946203; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=sJ37Vw16WXn6bnyCc+cTdkiu8/TxaoJDqxtOEeb8yqI=; b=TZ4cQIHg43yzJmlu012FYGSGzhObD3ksH4kLt9oQQ2D3+FuCyJNDhed/MR/JS2Zo5/ wMWuzKa39eeKrW60LW9ry0vJlyzgTcjtYS9p6n4CxA6WuPqkLcX2EovzBluNPukFTZiF l87n/RwFw2jLQSIkjrgbJykBnKmJuK0z00Zq0a1ULlU3cqb75B/qtuC7DVZqMqzM0tYt HLn/laatIBI0WaKtve8TvGWwaMqTTJsYJ/FFzBmuy4D6C95MU9+otlORIIf8OxTVWgkA nBks1hfPXqd8Piv235in4AEBjbwl7lVO3NlSXkbI63FNUsrWYp/pZb/3aq9KWNcqBpIX 8/yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341403; x=1705946203; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sJ37Vw16WXn6bnyCc+cTdkiu8/TxaoJDqxtOEeb8yqI=; b=c74xElF5XymRJmd/EbsJeva4I2F2P/MI8E38IhF9dJw5PNi2qo+gyB5EyZc2hPzsyg REsTUexyYDiUojw962pJhLk60DshcRlIlDAnDhqNQjdGozt12naKI1kbwLA+uah9Ytji MpQBGPD7qqLPrHS0AKrgaaQqmVAKUwZhiZsbxZ/mxnQcAvkNq4kBpfe+/QW18I0j93ez OwbglGKjGOJK1ES4tggo+TtdByxwzoR+xkcwLbAIzwDy5+pX7ugnXee0O4P4VMpMKxth u0EiCqpW2DKxASJc9si30ZKzsQvkG0YG92P3X+G02DeVODPXC6URRcCy3VuIImV+DZ3l NMJA== X-Gm-Message-State: AOJu0YyJOP8s6UhUT2boa3357wugnYV1Co8HkAQAIruBW6Eu35spWXOm F3bKrA29HCTyDWuzZ7TgefAWmGxA+g8= X-Google-Smtp-Source: AGHT+IE4DKzFtfVxJWzpCfN+yY9d+zc8scQdk7fRY5KXDJWhndUjmXvcobkVmz5oWsaHnihisMOu4A== X-Received: by 2002:a17:902:f7c9:b0:1d5:ba6d:552a with SMTP id h9-20020a170902f7c900b001d5ba6d552amr1190415plw.90.1705341403133; Mon, 15 Jan 2024 09:56:43 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f7cc00b001d59432a29csm6282455plw.282.2024.01.15.09.56.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:56:42 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 4/6] requirements.txt: bump all to latest Date: Mon, 15 Jan 2024 09:56:30 -0800 Message-Id: <412bd6a14f616586808df2621a71cda98847c313.1705341088.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:56:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62150 Bump all the dependencies to latest, using pur -r requirements.txt We are now able to build the mysqlclient==2.2.1 package, so the only constraint is Django>=4.2,<4.3 to keep us pinned at the desired LTS version. Signed-off-by: Tim Orling --- requirements.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements.txt b/requirements.txt index 20bcd30..ac06cfb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,20 +11,20 @@ confusable-homoglyphs==3.2.0 diff-match-patch==20230430 Django>=4.2,<4.3 django-appconf==1.0.6 -django-axes==6.2.0 +django-axes==6.3.0 django-cors-headers==4.3.1 django-ipware==6.0.3 django-ranged-response==0.2.0 django-registration==3.4 -django-reversion==5.0.9 +django-reversion==5.0.10 django-reversion-compare==0.16.2 django-simple-captcha==0.6.0 djangorestframework==3.14.0 gitdb==4.0.11 -GitPython==3.1.40 +GitPython==3.1.41 kombu==5.3.4 -mysqlclient==2.1.1 -Pillow==10.1.0 +mysqlclient==2.2.1 +Pillow==10.2.0 prompt-toolkit==3.0.43 python-dateutil==2.8.2 pytz==2023.3.post1 @@ -33,6 +33,6 @@ smmap==5.0.1 soupsieve==2.5 sqlparse==0.4.4 typing_extensions==4.9.0 -tzdata==2023.3 +tzdata==2023.4 vine==5.1.0 -wcwidth==0.2.12 +wcwidth==0.2.13 From patchwork Mon Jan 15 17:56:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37868 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 934F0C47422 for ; Mon, 15 Jan 2024 17:56:52 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web10.89710.1705341405511449292 for ; Mon, 15 Jan 2024 09:56:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=acXlmWnF; spf=pass (domain: gmail.com, ip: 209.85.214.178, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1d3e416f303so33183815ad.0 for ; Mon, 15 Jan 2024 09:56:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341404; x=1705946204; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jEqidSGevJkvqZn4RmPTq4TA4+2SoWG1B7QEr2j5ENg=; b=acXlmWnFqc7N7nd8LV28rILnmm86RV/KPg1tE1febQvPx2pe5ZRcCFNm6/U2Hfunbs GyjIs48UbLTW7vf3sF/+wb/iWTTFlt/jG//AfCTat/zfrNHCbTfzuM9Za871mNVe1K61 3d9wykw7lEpX/qNuG+keBz/0iFgrCUCSotdwtJYYbKe/vySKz6HVg4ngFsyhsipUICMq 7HcRuJCUgrza75uv444omDPm03yWhenMP6ax8ASE15Ed+rL40GUOFLrnkTCOygEZezOJ kkyHDKDuvEFYs4IIDgpBxHiNfS4ZODZF0FOw/4MxnXnV13crpHnJTV1SmW3TJAUImDGh /wEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341404; x=1705946204; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jEqidSGevJkvqZn4RmPTq4TA4+2SoWG1B7QEr2j5ENg=; b=mUSScqy0Oo5Ti69ruMw6ja2nI+mpr5rkE0p1vHzdCz7EstgdTcf8RTi/fc6jr64DjX 1IYUtBsv+TWVQmaUmxtrbHCuC2MF/kHOp2dQELPFB+Ye1ELt8Z8RcBttn8jskj4zxKWp r3RB9EhCZHgUSx6i6wuk+aIfg4aOnG8myIySPgycWJGXT6Zx3qnUEkweZ5pN5yA1+SR9 sLyDeK8Jza/VKkqHMuIjxj3MkY/C2W8L54K6HQUSl3rxeEDi1ZRE+9zqhNTO9KU37yPH Du/ntbig7xtAmTbRTJAhNUJoSGeKV0r9hZfaw3vGGxOBm9S5ARW0OGwEeXeDIAUJr1k9 hjrw== X-Gm-Message-State: AOJu0YyNENt7etnczJPj/K4f0bHvCYasNe9scMx7k8jMO8+OLzIDd9A0 YaqVMsY2VVN1+pDYox524q5NyxtSFGI= X-Google-Smtp-Source: AGHT+IHnGK1XMGUoRIls7os90PhPxlKYKKTXJqaNySnSipjNBEznZZRAu0r6YuED7zjVbSKcuo6rKw== X-Received: by 2002:a17:902:ecc5:b0:1d5:c77c:1bad with SMTP id a5-20020a170902ecc500b001d5c77c1badmr1499748plh.111.1705341404602; Mon, 15 Jan 2024 09:56:44 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f7cc00b001d59432a29csm6282455plw.282.2024.01.15.09.56.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:56:44 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 5/6] docker-compose.yml: mariadb:lts Date: Mon, 15 Jan 2024 09:56:31 -0800 Message-Id: <490205e3a63a4a177b6ae084479fda0822598d16.1705341088.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:56:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62151 We should really be striving to be compatible with the latest mariadb LTS (currently 10.11). Signed-off-by: Tim Orling --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index e57f59d..8b43946 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: layersdb: - image: mariadb:10.4 + image: mariadb:lts command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci --wait_timeout=28800 --max_allowed_packet=128M environment: - "MYSQL_DATABASE=layersdb" From patchwork Mon Jan 15 17:56:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Orling X-Patchwork-Id: 37867 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9E33AC47DA2 for ; Mon, 15 Jan 2024 17:56:52 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.89158.1705341406816416221 for ; Mon, 15 Jan 2024 09:56:46 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=A6vGs4r4; spf=pass (domain: gmail.com, ip: 209.85.214.169, mailfrom: ticotimo@gmail.com) Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-1d3ea5cc137so73049345ad.0 for ; Mon, 15 Jan 2024 09:56:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705341406; x=1705946206; darn=lists.yoctoproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=C2wYXQ8j3sfzKSP2oVzvjRm0EeUsaPvOaCQHzEHqg7U=; b=A6vGs4r4A6bXK9LtOysJJP/0RqJpzZ+eDuKiBP5DCwTa5Rx0CnTDiVMUdoTM5Egb/I ji3gw+d/i6IpXrmf8s8mzXlYCm9eDu6n0kjGpmoWs++WMQGDqdfFtHsXFi9Eq8U6v17M flNvaqmEptqNxkvw7UMg73zPIb3wjv5EahKn3Vv14qvQ3dPJgL/BXSR9k9g28+KYH/ew 6qHKvwKcOl1yGU+oRChKIKahpHMPNHiSxZ8jFtXLQ/PKkL6p/wTRV+iy4CEd8CHDLeUs Hg9lKpACS2OYJLzNs3yg6qs7/1iCHtIL6swe3R0E8d4qIhqNGJrVJBPtkmpYf7vt/MoZ fULQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705341406; x=1705946206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C2wYXQ8j3sfzKSP2oVzvjRm0EeUsaPvOaCQHzEHqg7U=; b=dpLs2Y3cQpku+lkAX/l+WuBBFrnXXO/8k5gN/T9hX8vARkn2Z/z3aKgXoUyZdsecx9 dmbT8yu0ts5DJQBOVdd+uTH/xJcM2sAWuubyeSrsRQuKtyHsBWb4g/nUpzcMrM5CE0ja ZbR42vPKwhadOJ9GMVBHIurX44JDekYBiLy5qnilwkJPsLz7oakYwxgQvGpNTGpGTUvA KtxSaYAKqmAMdSxz8Ybm7j+t3ybGFIDudp8k429BKpi8hKEezvN10ciM90DBwWyg8Z4P BBjsyOpvftnPFu08LqhKowXs409MqMm8FIzCiMcgEfOzG3I5uK5hS7zVioxbfoe1x1WB uFeQ== X-Gm-Message-State: AOJu0YxeccYcSbMkCq1OXGW4mQeQHeaR6c7x79ZZUj/IeXh6cTHJmPod a41/XITYSsseK6UDC7+7hG+V5KQojjY= X-Google-Smtp-Source: AGHT+IFNqlz7vKLkXSGxEEYXM2K+uPYHrAFIO8sN08MTjc/1EoE2dY2I7bev2yP3c8P0sxBuajfZfA== X-Received: by 2002:a17:902:694b:b0:1d5:5a2e:b32c with SMTP id k11-20020a170902694b00b001d55a2eb32cmr6100760plt.22.1705341406053; Mon, 15 Jan 2024 09:56:46 -0800 (PST) Received: from chiron.hsd1.or.comcast.net ([2601:1c0:ca01:19f0:9093:7b1b:b931:af99]) by smtp.gmail.com with ESMTPSA id h12-20020a170902f7cc00b001d59432a29csm6282455plw.282.2024.01.15.09.56.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jan 2024 09:56:45 -0800 (PST) From: Tim Orling X-Google-Original-From: Tim Orling To: yocto@lists.yoctoproject.org Subject: [layerindex-web][PATCH 6/6] docker-compose.yml: drop version '3' Date: Mon, 15 Jan 2024 09:56:32 -0800 Message-Id: <662ca9a4be52a21ed03e7421b51e5c1e1ef9afb1.1705341088.git.tim.orling@konsulko.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 15 Jan 2024 17:56:52 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto/message/62152 Drop the obsolete version: '3' property, it is no longer needed since late 2020 (Docker Compose 1.27+) and is only informative: https://nickjanetakis.com/blog/docker-tip-51-which-docker-compose-api-version-should-you-use https://github.com/compose-spec/compose-spec/blob/master/04-version-and-name.md Signed-off-by: Tim Orling --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8b43946..8704599 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ -version: '3' services: layersdb: image: mariadb:lts