From patchwork Mon Apr 6 17:30:07 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandeep Gundlupet Raju X-Patchwork-Id: 85355 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 3CC35F46C70 for ; Mon, 6 Apr 2026 17:30:09 +0000 (UTC) Received: from CY7PR03CU001.outbound.protection.outlook.com (CY7PR03CU001.outbound.protection.outlook.com [40.93.198.17]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.60424.1775496606987918127 for ; Mon, 06 Apr 2026 10:30:07 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@amd.com header.s=selector1 header.b=o21fey7o; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.93.198.17, mailfrom: sandeep.gundlupet-raju@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DHcpRbV6mRrXRsdUcAIEh3U+xvF6qNQJ74QqykPXcGHx+2PrQh69nW/7HZCArPpNXOWZ9tQMYJkbQl/NnErVq74x56B/t886JPTdnA8Ag3+4LmgCdsEOiVuUqawpG16LjvjXUlqob2F65qko6KzBV15oV4AOtcsEPlqnS3cj7BPiersjAjojM8BvTGVTgNkJrQQdJA83T6UEO8HjcN3Sadb/Wf12fSw4rhqrLq61yTCtpm33wzAoaTeK46j8PjSew37mgpw1CFMBWVtU+tfxQCBMwBWBYTIEyfORCnPVSXIZfOfDn7OSF7gPClR9/WhpGLzz/BQYwJBBvo76QQrftw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=86KA/ukUW/4qka76K7U3wAKQOUIoLCsXBtfJxjf9M6A=; b=Xp2AEO/yei/dQmdW5w7dAqHPepWjoBl087WShksiuaLtiWtlCzbELaNvsfBm6fRzREPpkFg67T5jGWWVTVKOCrBzeQ8RDYV7g/CevE4O3wODGbmZUc1O+f2B8c2A7jsQKaj1KYizoqlSzVVg2x11xbao/n6SHtvTBxI0Gm3qkyj/GyX8dV+ZT8isko6fQ1irm0QV/vZIhvtUdpeUMXHpPqDZteb8vEZ9+vPBKC48PyviAd9dAwoQ+zCzq3A5oLR5jkXHSDxF4TwNOFdyd0IA0rrKu9h+CspLcQg7+vJv5uhO7BwFZMH/pya320FSQnOKFF7TaTET2KwNnbtMOpxc0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.yoctoproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=86KA/ukUW/4qka76K7U3wAKQOUIoLCsXBtfJxjf9M6A=; b=o21fey7ogW4wu71Fp1ZoSXpgqGkSuSacctTwGkr27CKZsBH0sSbSAFmqiaR7Cll85JdFnQ3ASx51BkU4CIemFWnUlnK7/Kjl/Bn4bn2NKkr+KS0RM9/fe2vweorqPSdCUXEXXk8FNh+ym9XMN+gqcIIWWT+NAlGft2OSPOJ0fvw= Received: from PH8P223CA0028.NAMP223.PROD.OUTLOOK.COM (2603:10b6:510:2db::21) by MW6PR12MB8663.namprd12.prod.outlook.com (2603:10b6:303:240::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.11; Mon, 6 Apr 2026 17:29:58 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:510:2db:cafe::d5) by PH8P223CA0028.outlook.office365.com (2603:10b6:510:2db::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.32 via Frontend Transport; Mon, 6 Apr 2026 17:29:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Mon, 6 Apr 2026 17:29:57 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Mon, 6 Apr 2026 12:29:53 -0500 Received: from xcosantraju40.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Mon, 6 Apr 2026 12:29:53 -0500 From: Sandeep Gundlupet Raju To: CC: , Subject: [layerindex-web][PATCH v2 1/4] layerindex: Add app dir support for configurable container Date: Mon, 6 Apr 2026 11:30:07 -0600 Message-ID: <20260406173010.1366742-2-sandeep.gundlupet-raju@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> References: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|MW6PR12MB8663:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ed0e089-1aa0-4e14-b313-08de94021fd8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700016|1800799024|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: 6WE+mMe8p5o2xTfet2xhi27gkUyJxySrUOwYE0iVECDX549BC67mPlurG34eCClVWbQSTnieIeERoplZvBpaEZ34QK3FPiNyt0fbuFGwz0Fdm3wRLVFLBefT86ylXOxmlBH2qey5JcNrU+a7rlHQszsRyI+9gnmjR8Fb3E98kGhXY6K4cH6aWspIWgsGashKxg2rtaCpJiWag1QMrAV2qWVcvsUiYRz+Rxkmz6KVxs1LhDK8uKMybLVSom0sj2Z9IH0ksY4m0R2xmu7l7u0QaZnfLNBF4xympthdE6f9gM8/TlP+tPXD8JCXKGxN1vdMQeDvKDGi1/hTJwnmrlzHC/c2H6dVjyq3/tYJhavqsZE1RGt5wMQaDdfE9x4yyo6Y/KLQqHBX8RwB5rPQj62kYsR8+ZjphqYQgVpstJAq+KVtqGg3I+PC21CPRbdmPQ00LvYbfNSeNHLXw4C5OR2FWbxaDDIYmSXalu7EZ5/KvFGWL4zH7Kqi91X7I2z2ZvoBW32sBBDigKRgeFh/8LnRnVRlaGL6FkaPFC96cqu2ZqSD5fZMwM7ZwW5awhDYlUrgoMRIq5ropia5pvVILwE3AXIPgJFmweEhtGo/meLJrLcXZ0mFpq2KGvYSHS7eskPIM8/94fVRTEyHF+u/rc6d/5e3bCuh19H7KzLeWNxGP3oLbnOjHtWFJv8hG0hyKNvPrxgf+eGLY4O6ghJTbPbI7RliM9bTVRj0yczawJoJvAx2hnSjXompECPS8YJqSA+qnxAlC0EUju+MQqpl5TbY/A== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(376014)(36860700016)(1800799024)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nvW++dTeiE+yBKpxveYIX0Hp2qfgFw3jZIQBkWBsyVyJdN6Z/GWXRcwJiZS07oCJs/9wmMTkyWhOBQmBVT1XJbpy4pb0NTPhbro6JBwSCdp8z/8Q3+bCdhrS36Vm8M2enkHzwXLNRG611cAT/5NQtcjuyVxT5ORrbKziZO+znjrznsS38geefpY4hjUon9H5XAqE8gcif+bM7ZnCwFNpsGonvGqcmqD2K0WHp1+syjmnJWYeNYkjyGLRYpJM3tQdRHF7rNjBA33S8PjFhbJyeLJQr5orUPmIoQG375xMt8u5Q6tkA+N0r5q5hw72N/mQbj9J3v6wTBneuaYwnEMrpJ994vXw/BSCYReqaAdhrFxnvU6+MhC7yS/DDGhdAXCfCwuBiPnNrAmV8itF+dGoiGXMzhnQ1+DmQDzj5nLEjaEjBTPakUsU63YM3RRkeZPm X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2026 17:29:57.7722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2ed0e089-1aa0-4e14-b313-08de94021fd8 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8663 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Apr 2026 17:30:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/3649 Add a new --app-dir command-line argument (default: /opt) to allow the base directory used inside the containers to be configurable instead of being hardcoded to /opt. Changes: - dockersetup.py: add --app-dir argument; write APP_DIR to .env file via new write_env_file() so docker-compose passes it as a build arg; update edit_dockercompose() to expand build: block and inject APP_DIR build arg reference, and rewrite volume mounts and celery --workdir accordingly; propagate app_dir through setup_https(), check_connectivity(), and all direct docker-compose run call sites - Dockerfile: add ARG APP_DIR=/opt + ENV APP_DIR=${APP_DIR}; replace all hardcoded /opt paths with ${APP_DIR} in COPY, RUN and CMD instructions - docker/migrate.sh: replace /opt with ${APP_DIR:-/opt} - docker/refreshlayers.sh: replace /opt with ${APP_DIR:-/opt} - docker/updatelayers.sh: replace /opt with ${APP_DIR:-/opt} - Pass app_dir to edit_settings_py() and replace the hardcoded LAYER_FETCH_DIR = "/opt/workdir" with app_dir + "/workdir", so the fetch directory respects the --app-dir option. AI-Generated: GitHub Copilot (Claude Sonnet 4.6) Signed-off-by: Sandeep Gundlupet Raju --- Changes in v2: - Pass app_dir to edit_settings_py() and replace the hardcoded LAYER_FETCH_DIR = "/opt/workdir" with app_dir + "/workdir", so the fetch directory respects the --app-dir option. --- Dockerfile | 24 ++++++------ docker/migrate.sh | 2 +- docker/refreshlayers.sh | 2 +- docker/updatelayers.sh | 2 +- dockersetup.py | 86 +++++++++++++++++++++++++++++++++-------- 5 files changed, 85 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index 72f57d2..8e6e508 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM ubuntu:jammy LABEL maintainer="Michael Halstead " +ARG APP_DIR=/opt +ENV APP_DIR=${APP_DIR} ENV PYTHONUNBUFFERED=1 \ LANGUAGE=en_US \ LANG=en_US.UTF-8 \ @@ -55,22 +57,22 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean -COPY . /opt/layerindex -RUN rm -rf /opt/layerindex/docker -COPY docker/settings.py /opt/layerindex/settings.py -COPY docker/refreshlayers.sh /opt/refreshlayers.sh -COPY docker/updatelayers.sh /opt/updatelayers.sh -COPY docker/migrate.sh /opt/migrate.sh -COPY docker/connectivity_check.sh /opt/connectivity_check.sh +COPY . ${APP_DIR}/layerindex +RUN rm -rf ${APP_DIR}/layerindex/docker +COPY docker/settings.py ${APP_DIR}/layerindex/settings.py +COPY docker/refreshlayers.sh ${APP_DIR}/refreshlayers.sh +COPY docker/updatelayers.sh ${APP_DIR}/updatelayers.sh +COPY docker/migrate.sh ${APP_DIR}/migrate.sh +COPY docker/connectivity_check.sh ${APP_DIR}/connectivity_check.sh -RUN mkdir /opt/workdir \ +RUN mkdir ${APP_DIR}/workdir \ && adduser --system --uid=500 layers \ - && chown -R layers /opt/workdir + && chown -R layers ${APP_DIR}/workdir USER layers # Always copy in .gitconfig and proxy helper script (they need editing to be active) COPY docker/.gitconfig /home/layers/.gitconfig -COPY docker/git-proxy /opt/bin/git-proxy +COPY docker/git-proxy ${APP_DIR}/bin/git-proxy # Start Gunicorn -CMD ["/usr/local/bin/gunicorn", "wsgi:application", "--workers=4", "--bind=:5000", "--timeout=60", "--log-level=debug", "--chdir=/opt/layerindex"] +CMD ["/bin/sh", "-c", "/usr/local/bin/gunicorn wsgi:application --workers=4 --bind=:5000 --timeout=60 --log-level=debug --chdir=${APP_DIR}/layerindex"] diff --git a/docker/migrate.sh b/docker/migrate.sh index ca15368..bb9f646 100755 --- a/docker/migrate.sh +++ b/docker/migrate.sh @@ -1,2 +1,2 @@ #!/bin/bash -python3 /opt/layerindex/manage.py migrate "$@" +python3 ${APP_DIR:-/opt}/layerindex/manage.py migrate "$@" diff --git a/docker/refreshlayers.sh b/docker/refreshlayers.sh index 0c550bd..5adaf86 100755 --- a/docker/refreshlayers.sh +++ b/docker/refreshlayers.sh @@ -1,3 +1,3 @@ #!/bin/bash -update=/opt/layerindex/layerindex/update.py +update=${APP_DIR:-/opt}/layerindex/layerindex/update.py $update -q -r diff --git a/docker/updatelayers.sh b/docker/updatelayers.sh index 21640ba..6f0e8f0 100755 --- a/docker/updatelayers.sh +++ b/docker/updatelayers.sh @@ -1,3 +1,3 @@ #!/bin/bash -update=/opt/layerindex/layerindex/update.py +update=${APP_DIR:-/opt}/layerindex/layerindex/update.py $update -q diff --git a/dockersetup.py b/dockersetup.py index bc7478c..3a74eb3 100755 --- a/dockersetup.py +++ b/dockersetup.py @@ -70,6 +70,7 @@ def get_args(): parser.add_argument('--no-migrate', action="store_true", default=False, help='Skip running database migrations') parser.add_argument('--no-admin-user', action="store_true", default=False, help='Skip adding admin user') parser.add_argument('--no-connectivity', action="store_true", default=False, help='Skip checking external network connectivity') + parser.add_argument('--app-dir', type=str, help='Base directory inside the container for application files. Default is %(default)s', required=False, default='/opt') args = parser.parse_args() @@ -253,14 +254,16 @@ def yaml_comment(line): # Add hostname, secret key, db info, and email host in docker-compose.yml -def edit_dockercompose(hostname, dbpassword, dbapassword, secretkey, rmqpassword, portmapping, letsencrypt, email_host, email_port, email_user, email_password, email_ssl, email_tls): +def edit_dockercompose(hostname, dbpassword, dbapassword, secretkey, rmqpassword, portmapping, letsencrypt, email_host, email_port, email_user, email_password, email_ssl, email_tls, app_dir='/opt'): + + in_layersapp_build = False def adjust_cert_mount_line(ln): linesplit = ln.split(':') if letsencrypt: linesplit[1] = '/etc/letsencrypt' else: - linesplit[1] = '/opt/cert' + linesplit[1] = app_dir + '/cert' # This allows us to handle if there is a ":ro" or similar on the end return ':'.join(linesplit) @@ -305,6 +308,33 @@ def edit_dockercompose(hostname, dbpassword, dbapassword, secretkey, rmqpassword newlines.append(ucline + '\n') else: newlines.append(yaml_comment(line) + '\n') + elif re.match(r'^\s+build:\s+\.$', line): + # Convert inline 'build: .' to block form so we can pass APP_DIR as a build arg + indent = line[:len(line) - len(line.lstrip())] + newlines.append(indent + 'build:\n') + newlines.append(indent + ' context: .\n') + newlines.append(indent + ' args:\n') + newlines.append(indent + ' - APP_DIR=${APP_DIR}\n') + in_layersapp_build = True + continue + elif '- APP_DIR=' in line: + # Keep APP_DIR referencing the .env file (do not embed value here) + format = line[:line.find('- APP_DIR=')].replace('#', '') + newlines.append(format + '- APP_DIR=${APP_DIR}\n') + continue + elif re.match(r'^\s+context:\s+\.$', line) and in_layersapp_build: + in_layersapp_build = False + newlines.append(line + '\n') + continue + elif ':/opt/workdir' in line: + newlines.append(line.replace(':/opt/workdir', ':' + app_dir + '/workdir') + '\n') + continue + elif ':/opt/layerindex-task-logs' in line: + newlines.append(line.replace(':/opt/layerindex-task-logs', ':' + app_dir + '/layerindex-task-logs') + '\n') + continue + elif '--workdir=/opt/layerindex' in line: + newlines.append(line.replace('--workdir=/opt/layerindex', '--workdir=' + app_dir + '/layerindex') + '\n') + continue elif "layersweb:" in line: in_layersweb = True newlines.append(line + "\n") @@ -426,7 +456,7 @@ def edit_nginx_ssl_conf(hostname, https_port, certdir, certfile, keyfile): writefile("docker/nginx-ssl-edited.conf", ''.join(newlines)) -def edit_settings_py(emailaddr): +def edit_settings_py(emailaddr, app_dir='/opt'): filedata = readfile('docker/settings.py') newlines = [] lines = filedata.splitlines() @@ -444,6 +474,9 @@ def edit_settings_py(emailaddr): newlines.append(" ('Admin', '%s'),\n" % emailaddr) newlines.append(")\n") continue + elif line.lstrip().startswith('LAYER_FETCH_DIR'): + newlines.append("LAYER_FETCH_DIR = \"%s/workdir\"\n" % app_dir) + continue newlines.append(line + "\n") writefile("docker/settings.py", ''.join(newlines)) @@ -474,9 +507,9 @@ def edit_dockerfile_web(hostname, no_https): writefile("Dockerfile.web", ''.join(newlines)) -def setup_https(hostname, http_port, https_port, letsencrypt, letsencrypt_production, cert, cert_key, emailaddr): +def setup_https(hostname, http_port, https_port, letsencrypt, letsencrypt_production, cert, cert_key, emailaddr, app_dir='/opt'): local_cert_dir = os.path.abspath('docker/certs') - container_cert_dir = '/opt/cert' + container_cert_dir = app_dir + '/cert' if letsencrypt: # Create dummy cert container_cert_dir = '/etc/letsencrypt' @@ -578,8 +611,26 @@ def edit_options_file(project_name): f.write('project_name=%s\n' % project_name) -def check_connectivity(): - return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', '/opt/connectivity_check.sh'], shell=False) +def write_env_file(app_dir): + """Write APP_DIR to .env so docker-compose passes it as a build arg.""" + env_vars = {} + try: + with open('.env', 'r') as f: + for line in f: + line = line.strip() + if '=' in line and not line.startswith('#'): + k, v = line.split('=', 1) + env_vars[k.strip()] = v.strip() + except FileNotFoundError: + pass + env_vars['APP_DIR'] = app_dir + with open('.env', 'w') as f: + for k, v in env_vars.items(): + f.write('%s=%s\n' % (k, v)) + + +def check_connectivity(app_dir='/opt'): + return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', app_dir + '/connectivity_check.sh'], shell=False) if return_code != 0: print("Connectivity check failed - if you are behind a proxy, please check that you have correctly specified the proxy settings on the command line (see --help for details)") sys.exit(1) @@ -741,24 +792,25 @@ if args.uninstall: if args.update: args.no_https = read_dockerfile_web() if not args.no_https: - container_cert_dir = '/opt/cert' + container_cert_dir = args.app_dir + '/cert' args.hostname, https_port, certdir, certfile, keyfile = read_nginx_ssl_conf(container_cert_dir) edit_nginx_ssl_conf(args.hostname, https_port, certdir, certfile, keyfile) else: # Always edit these in case we switch from proxy to no proxy edit_gitproxy(socks_proxy_host, socks_proxy_port, args.no_proxy) edit_dockerfile(args.http_proxy, args.https_proxy, args.no_proxy) + write_env_file(args.app_dir) - edit_dockercompose(args.hostname, dbpassword, dbapassword, secretkey, rmqpassword, args.portmapping, args.letsencrypt, email_host, email_port, args.email_user, args.email_password, args.email_ssl, args.email_tls) + edit_dockercompose(args.hostname, dbpassword, dbapassword, secretkey, rmqpassword, args.portmapping, args.letsencrypt, email_host, email_port, args.email_user, args.email_password, args.email_ssl, args.email_tls, args.app_dir) edit_dockerfile_web(args.hostname, args.no_https) - edit_settings_py(emailaddr) + edit_settings_py(emailaddr, args.app_dir) edit_options_file(args.project_name) if not args.no_https: - setup_https(args.hostname, http_port, https_port, args.letsencrypt, args.letsencrypt_production, args.cert, args.cert_key, emailaddr) + setup_https(args.hostname, http_port, https_port, args.letsencrypt, args.letsencrypt_production, args.cert, args.cert_key, emailaddr, args.app_dir) ## Start up containers return_code = subprocess.call(['docker-compose', 'up', '-d', '--build'], shell=False) @@ -768,7 +820,7 @@ if return_code != 0: if not (args.update or args.no_connectivity): ## Run connectivity check - check_connectivity() + check_connectivity(args.app_dir) # Get real project name (if only there were a reasonable way to do this... ugh) real_project_name = '' @@ -830,7 +882,7 @@ if not args.no_migrate: env = os.environ.copy() env['DATABASE_USER'] = 'root' env['DATABASE_PASSWORD'] = dbapassword - return_code = subprocess.call(['docker-compose', 'run', '--rm', '-e', 'DATABASE_USER', '-e', 'DATABASE_PASSWORD', 'layersapp', '/opt/migrate.sh'], shell=False, env=env) + return_code = subprocess.call(['docker-compose', 'run', '--rm', '-e', 'DATABASE_USER', '-e', 'DATABASE_PASSWORD', 'layersapp', args.app_dir + '/migrate.sh'], shell=False, env=env) if return_code != 0: print("Applying migrations failed") sys.exit(1) @@ -864,13 +916,13 @@ if not args.update: break for volume in volumes: volname = '%s_%s' % (real_project_name, volume) - return_code = subprocess.call(['docker', 'run', '--rm', '-v', '%s:/opt/mount' % volname, 'debian:stretch', 'chown', '500', '/opt/mount'], shell=False) + return_code = subprocess.call(['docker', 'run', '--rm', '-v', '%s:%s/mount' % (volname, args.app_dir), 'debian:stretch', 'chown', '500', args.app_dir + '/mount'], shell=False) if return_code != 0: print("Setting volume permissions for volume %s failed" % volume) sys.exit(1) ## Generate static assets. Run this command again to regenerate at any time (when static assets in the code are updated) -return_code = subprocess.call("docker-compose run --rm -e STATIC_ROOT=/usr/share/nginx/html -v %s_layersstatic:/usr/share/nginx/html layersapp /opt/layerindex/manage.py collectstatic --noinput" % quote(real_project_name), shell = True) +return_code = subprocess.call("docker-compose run --rm -e STATIC_ROOT=/usr/share/nginx/html -v %s_layersstatic:/usr/share/nginx/html layersapp %s/layerindex/manage.py collectstatic --noinput" % (quote(real_project_name), args.app_dir), shell = True) if return_code != 0: print("Collecting static files failed") sys.exit(1) @@ -891,12 +943,12 @@ else: if not args.update: if not args.databasefile: ## Set site name - return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', '/opt/layerindex/layerindex/tools/site_name.py', host, 'OpenEmbedded Layer Index'], shell=False) + return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', args.app_dir + '/layerindex/layerindex/tools/site_name.py', host, 'OpenEmbedded Layer Index'], shell=False) if not args.no_admin_user: ## For a fresh database, create an admin account print("Creating database superuser. Input user name and password when prompted.") - return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', '/opt/layerindex/manage.py', 'createsuperuser', '--email', emailaddr], shell=False) + return_code = subprocess.call(['docker-compose', 'run', '--rm', 'layersapp', args.app_dir + '/layerindex/manage.py', 'createsuperuser', '--email', emailaddr], shell=False) if return_code != 0: print("Creating superuser failed") sys.exit(1) From patchwork Mon Apr 6 17:30:08 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandeep Gundlupet Raju X-Patchwork-Id: 85352 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 D4C65F46C66 for ; Mon, 6 Apr 2026 17:30:08 +0000 (UTC) Received: from BN8PR05CU002.outbound.protection.outlook.com (BN8PR05CU002.outbound.protection.outlook.com [52.101.57.31]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.60556.1775496599411457887 for ; Mon, 06 Apr 2026 10:29:59 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@amd.com header.s=selector1 header.b=HPTMeN+O; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 52.101.57.31, mailfrom: sandeep.gundlupet-raju@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q0gZZCkBppIuNdCTUNp0bbdZ31e9Mni3BbARlmUr8f/4Eeik0+YFCbDySFL5z9CDCKS0jQ59YcoPuojTyNhK8hLRoPMMsAvviJAIlRvK5MFdCRb/jxFMdg/kB75IaazNIlX6XBeF7OXKt6mvZIYRfKOhu5yWO5H7Cd9+e1Ge+SM7Fnui+m25DKIJ3owiaMvr1cvljC3oYPQjaWrkG540Nn4j/9hbtPDutd6KaucWLpsopC6fddP7VMyYswvV/sUnSQd5Vyt5MdVXunlB0n0QKtn388wXT/l+ECC7Hqb4A45ZDzeXjwXuF60ia9Lk+9eTVxQHpQuuVwK861u85HZhAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xJefhWtez0v6CPmTvxt9LOz/pPwwr9BZQ6kJCt3ENGU=; b=Jfs6Kcn7/r96vIgM6hCuwNBO1ZvnGCEAeB+C8bLcu2L2wHE7R2GKyAX3LwNysJd2IyMpFUbPuqL0hnMXEfSEqXjz3HAAPvjt5pkusadF1kJrA0wF9vV0uMDUtOS9tCb5oO9+Xls+JyycgwcCO+6SLXPZNRKGlhFlWOOos6J2Cml8phLO1MmL2daPT9oZP5D9XqomsX29YWjCZPuI9tNEL5w33mtIYMIaCmYxQLJf+cf3c1lJBqIIV3XB1KMIrUfkZx6nWq7zxOvXB5ZFpJC3vzlM8Aq5JObqUPHoWvCg02nl1I2LID3nvz30uw1QxFs3CgJeSwfQExXz1vAT1LrS/Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.yoctoproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=xJefhWtez0v6CPmTvxt9LOz/pPwwr9BZQ6kJCt3ENGU=; b=HPTMeN+ObHXpE2bDOrv7cUVJs/61SNkz8Ozq9g0oX0J7Sl0Zq1L2ePfNvXv/dTFucv3so8tvr783GbGCA/qrLYf1Yf7k32OcCG+2gDcFxNCyAZOZdmr6TRw+6D2BMWrihWOxK3fePBg92M3zpIfmJnX2Msu+0+HCigPHB6Q7iw0= Received: from IA4P220CA0001.NAMP220.PROD.OUTLOOK.COM (2603:10b6:208:558::14) by DS0PR12MB7728.namprd12.prod.outlook.com (2603:10b6:8:13a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.19; Mon, 6 Apr 2026 17:29:54 +0000 Received: from BN3PEPF0000B074.namprd04.prod.outlook.com (2603:10b6:208:558:cafe::96) by IA4P220CA0001.outlook.office365.com (2603:10b6:208:558::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.32 via Frontend Transport; Mon, 6 Apr 2026 17:30:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb07.amd.com; pr=C Received: from satlexmb07.amd.com (165.204.84.17) by BN3PEPF0000B074.mail.protection.outlook.com (10.167.243.119) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Mon, 6 Apr 2026 17:29:54 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Mon, 6 Apr 2026 12:29:54 -0500 Received: from satlexmb07.amd.com (10.181.42.216) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 6 Apr 2026 12:29:54 -0500 Received: from xcosantraju40.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Mon, 6 Apr 2026 12:29:53 -0500 From: Sandeep Gundlupet Raju To: CC: , Subject: [layerindex-web][PATCH v2 2/4] connectivity_check.sh: Use yoctoproject.org for HTTPS check Date: Mon, 6 Apr 2026 11:30:08 -0600 Message-ID: <20260406173010.1366742-3-sandeep.gundlupet-raju@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> References: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: sandeep.gundlupet-raju@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN3PEPF0000B074:EE_|DS0PR12MB7728:EE_ X-MS-Office365-Filtering-Correlation-Id: b08184ad-a759-4adb-4b0a-08de94021deb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|376014|82310400026|1800799024|13003099007|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: zzG1hq3/qjzPPxVw/K+YbjNThSLw7Gr93mCQQi/By0TOMtCjYnkwbFRJU962QZipmJFqoPwSiP7woqGonLasU+G7aZN4rIVr7ErUNkizL3MS67TXeSmwegpk0WsD4AFN8ZripQ21wDOC6uYxi77PUzaqAUMixKuqXE/YxrYaFyHU0FrsSFz+MfqO5mZomt/VCDt6Qgr45HqD78/PdCCOfTikW/tKvwxwB510w9jeII3sNDsgIvCAEMhtfu3jsxImvu1Bo3BByu3b3Y2w5jOLucXJtqO0B/4Q8zTt7RkbcFwlWdfXZDmwq7EPxKWwMr/ma7PsdoEINgxGD/Ad0E08FaWWsZQjsnReSFVe4EKxHBGANd4ei5TaOMWiYRnF9bb/lZxf+PcWsgJSp3y+eqdxHe9o6OC24ttoX9ZiWfPSS52TEXdhfs6s3/+rW87H2/TbZ/w3flprd2FIorJK82NHoRerEt8ZnqNBptvg8H6o8UPnQF14HmT7hIdZjh716V5cBtLs64TYG58bC8sCKyP3fp/P2EdJbHCr6EETgnbUok7OO7tTFJEkNFdp2myhPKCi/n2V8STKyp6FminQ8TOBq3TX0EHRvyY4CbQIASUs6pTgnrWWBy8YE9B8yIx4TT1SDXbkFgz1Th2/sAFmLS0cI1dkYUcdJiX1U/4f3L1k6z+14ERfb6ML0QFf5zaIsVuHY7pq4dU5mBZ3rWpycBE72g== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb07.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700016)(376014)(82310400026)(1800799024)(13003099007)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UkovibEuWQHjljR6pDooprGe5FOGqjsmjo6u1Cj3TWi1wUso3l2LsIXu8VwuU6sS5UtBvDciXbhmHQthZmk252N+2fQ05dZLP6gWKw2HkDWcYUk4F0yGhN4AiJSq6E3xBqYx87LNvpyqCJAE2odoWY3mlhzUPrZK5zWzs115Sf9leisXidiLw/Ze+G0elDpo49CRQYtHFtrZgWdgGPFbyVYEJnYFHxA89+RrbU1fyK72B4FPxv7AT4cKe9MUXG3tt7DL8DJfbx0HCWycd7z1IBN5I36c/oqYU6MlajeY1TuynzCu1Jn+N62QTrS6h/VujaoZpYA3D4H38TS/ztqBGYv0lI2/pGEECEXIRNGuFRhMLMVV91QwfOlafhpNwurUmMQUQSLvfv8M4h7ckCNDtO1+vYbO+2lJkIZG9FfemeCnl3Ri8ziCvefI6e62yXIJ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2026 17:29:54.5562 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b08184ad-a759-4adb-4b0a-08de94021deb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb07.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN3PEPF0000B074.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7728 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Apr 2026 17:30:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/3645 Replace google.com with yoctoproject.org as the HTTPS test URL. google.com may be blocked or considered unsafe on some Linux host environments, while yoctoproject.org is a more appropriate and reliable choice for a Yocto/OE layer index deployment. AI-Generated: GitHub Copilot (Claude Sonnet 4.6) Signed-off-by: Sandeep Gundlupet Raju --- Changes in v2: - None --- docker/connectivity_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/connectivity_check.sh b/docker/connectivity_check.sh index 59b26b8..89931b0 100755 --- a/docker/connectivity_check.sh +++ b/docker/connectivity_check.sh @@ -18,7 +18,7 @@ if ! wget -q $HTTP_TEST_URL ; then exit 1 fi -HTTPS_TEST_URL="https://google.com" +HTTPS_TEST_URL="https://yoctoproject.org" if ! wget -q $HTTPS_TEST_URL ; then echo "ERROR: failed to fetch $HTTPS_TEST_URL" cleanup_tmp From patchwork Mon Apr 6 17:30:09 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandeep Gundlupet Raju X-Patchwork-Id: 85354 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 29139F46C6D for ; Mon, 6 Apr 2026 17:30:09 +0000 (UTC) Received: from DM1PR04CU001.outbound.protection.outlook.com (DM1PR04CU001.outbound.protection.outlook.com [52.101.61.23]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.60413.1775496602278929673 for ; Mon, 06 Apr 2026 10:30:02 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@amd.com header.s=selector1 header.b=qEkhuCJo; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 52.101.61.23, mailfrom: sandeep.gundlupet-raju@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vKkyG6iAauv51gSo+ZzkIu55FrKJIF5Kpp/S3IF4qFqHof131bTQH/tD79X+isY81Fh777mYkGEs0c3jF4IfWqddCLpRU+RYApnGI8NtdTeaBSgJThVO9S56UlzIazZCjAH/QZNi9mGUM/GSDjvSiMNIdQi6ZO3WZzLniqzzt5bHVGD7FM7sHkPNEIexIqt0GiI+TZky2ZYyjosPvoiWRYcMRj743XHy5pUZkHhMr/TtfvX2U+t+QvmcbCHUcWOL4lKJ5i7V94ShuMWeiu+mgeNp8moCknIkoYeu2CbwdB8xFlNRs2YgkWh9Dbjp38ZmZ2HPKioTl7hr8/Kyt74xfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ATWjgJPs+rFibSnR9zQ91iuBqbxJPAxmFmWBDxy84lc=; b=TsytTYqQoQjDZoAgbx/hDScHOHb91IX0F5VXAAos+U2xSV3sPrWigWGCf4w+HpsOnWgyU5N24/dTeosEfELuh+cwLddjMT10XC+rIO9cWqSgM0wvoRjQU2+4nBlrqsAu8YzcYX3RJVXFeWvP9j4CInOqepTxB2MF5Btr4JK5x+2rMM0tj3BQF7VH6C+evjc5kRTGpsoa5tn1JcXfzkLHaxY++oYYgizXMvLl80yGtM/weThnLkP1yzujRTyzkO0TqkBSE7krHs949xGotWvfM5bQKHpnEeswD25fzEQLFSh8zZ4LCzwTjHRYDAHKgC3Q76A0ac9hIW3DKl8CLNn8RA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.yoctoproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ATWjgJPs+rFibSnR9zQ91iuBqbxJPAxmFmWBDxy84lc=; b=qEkhuCJovIZFRo6wfy5RRjyETiHXX8dcCz9j/hJKWEhA2xqGL6R5kyUN5SWulD6QuaDhSkrFIfIBeMaRBtANd5uXBOkDhAy8fHXeO+XWEFDh3J5XelLlvbZZIs2IQm13pXCa80NJzlN7eYyS9gTOuZPtIbPzl8LCf7yDRRPZeq0= Received: from PH8P223CA0004.NAMP223.PROD.OUTLOOK.COM (2603:10b6:510:2db::29) by CH2PR12MB4199.namprd12.prod.outlook.com (2603:10b6:610:a7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17; Mon, 6 Apr 2026 17:29:59 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:510:2db:cafe::be) by PH8P223CA0004.outlook.office365.com (2603:10b6:510:2db::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.32 via Frontend Transport; Mon, 6 Apr 2026 17:29:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Mon, 6 Apr 2026 17:29:58 +0000 Received: from SATLEXMB04.amd.com (10.181.40.145) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.2.2562.17; Mon, 6 Apr 2026 12:29:54 -0500 Received: from satlexmb07.amd.com (10.181.42.216) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Mon, 6 Apr 2026 12:29:54 -0500 Received: from xcosantraju40.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Mon, 6 Apr 2026 12:29:54 -0500 From: Sandeep Gundlupet Raju To: CC: , Subject: [layerindex-web][PATCH v2 3/4] README.devel: Replace deprecated libmariadb package Date: Mon, 6 Apr 2026 11:30:09 -0600 Message-ID: <20260406173010.1366742-4-sandeep.gundlupet-raju@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> References: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> MIME-Version: 1.0 Received-SPF: None (SATLEXMB04.amd.com: sandeep.gundlupet-raju@amd.com does not designate permitted sender hosts) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|CH2PR12MB4199:EE_ X-MS-Office365-Filtering-Correlation-Id: eb2cb95f-afb9-47c2-03ae-08de94022060 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|376014|36860700016|18002099003|22082099003|56012099003; X-Microsoft-Antispam-Message-Info: qxHRNe31IRwAKodkAZCWnpt50MR4h9xMi2wm5JjLKqwqG9eAhAp+NZ1fn2V+NKd7W8yopKQdyYZKnYul/YozjJxLsBwAFe0gKz8PKnAWA5+KVn8vpHz2sCfrUxizb8q8SUtmjqCAnuq6WOwM7yU0C4xdjsh9cbOki/nwqIfid2kVc+FCiGfMyTAaQ1vKCHFLXhYZ/Sb7tn79D1UWFPplWkKGql8Kuvq9CTf3MeYfGtb4IvqO4FkO8T5V4HW1c3Ny0i3M9/kf/X0je3e930VSnBp98mwhNog1kIEtApUEcPRlUDy7uSaoxEqJIwIrr2fnrqYQ61NeYBNQ590uv2h1+WTWBwGiZl6myNRi5PQH+bn4AdvitJFMKQ7oaD64akgMI61ibvmAr3mtkTqiFNAP1tZbl4hYz9LUl4jnmvgaMFlNV6A0MzaXP/gb3EQFfflMZYEKJPjhG8KrOEok3l16NxcRRDMAaCNX0Og4N3eAVMwMJX5qga16mlms1mystotQG5YhKhLJWo5C+WIiO2BIBP2I28HOuC2R4MBIM9tMES67p8WCC8iOq/25RsFbWzIrHJwIz6ID6Jb/58UYtbL/HX6kdxFOdisIiqRO6wTYXdddOjwmOYyXMfxb+Hg4eApjo0MKVg9r3orpEReLNSKBQn8cd0k+p2joBk+pLh3Aq6RKb/NjkqpsvoDijT/jIyG801hsUBhzX536LCB9JGeILCRp3FRDfSbdY0pLDel3eEndIA3oxTSewRrPSkB1wF3xgrFCY98XzG7IrmuJNTYK7A== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(1800799024)(376014)(36860700016)(18002099003)(22082099003)(56012099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GWoyoWu59K9wmRCeHHhXKU8hh3BaUPNWg+hWBHierQwLhFcPYx4u1vJhPoCkTdA5l3DaqCIfkrMxM78Eha3RCS4Cy/2ef18tnyeH+YR4zdWRis3Q5rXlUy0Si7amdtdGe2EYlFIGTTS2/lMaLBW4sjQqoNBpSy2eRda9s6iGNxbZpt0CW1PsK7b+gmnvVxJxopHq+g5bSNHAvPWsaHUc/Mu3XluUyvm4dbYszg/O8/fTWmyxk4fqFCl1bZyWxbwkACS3Itzq0fFVPf4f9sYZp4xUIsxnk8VFo+ezzL1PgpIcsPV+JaS68MmMFArGDEdtJXq5n2lC/muhq4Xd8NOGuOhUdf7vy57rX4MO8beBiHrZlhcC9wbHgI56tet3ifbobJpyQoggU5MU6B9b+mDUhB00dTgkDCJpwCyqIuH448TD70asKEgMa/Jdg7fUJvi/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2026 17:29:58.6584 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb2cb95f-afb9-47c2-03ae-08de94022060 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4199 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Apr 2026 17:30:09 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/3647 Replace deprecated libmariadb-client-lgpl-dev with libmariadb-dev package in README.devel instructions. AI-Generated: GitHub Copilot (Claude Sonnet 4.6) Signed-off-by: Sandeep Gundlupet Raju --- Changes in v2: - None --- README.devel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.devel b/README.devel index 78fbfbb..de370e5 100644 --- a/README.devel +++ b/README.devel @@ -40,7 +40,7 @@ distros). the database backend): sudo apt-get update - sudo apt-get install python3-venv libmariadb-client-lgpl-dev build-essential python3-dev libjpeg-dev libz-dev libfreetype6-dev libssl-dev mariadb-server rabbitmq-server + sudo apt-get install python3-venv libmariadb-dev build-essential python3-dev libjpeg-dev libz-dev libfreetype6-dev libssl-dev mariadb-server rabbitmq-server 2. Work around path issues (you may not need this): From patchwork Mon Apr 6 17:30:10 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sandeep Gundlupet Raju X-Patchwork-Id: 85353 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 F1031F46C69 for ; Mon, 6 Apr 2026 17:30:08 +0000 (UTC) Received: from CY7PR03CU001.outbound.protection.outlook.com (CY7PR03CU001.outbound.protection.outlook.com [40.93.198.34]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.60416.1775496604086317361 for ; Mon, 06 Apr 2026 10:30:04 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="dkim: body hash did not verify" header.i=@amd.com header.s=selector1 header.b=kb88lMzk; spf=permerror, err=parse error for token &{10 18 %{i}._ip.%{h}._ehlo.%{d}._spf.vali.email}: invalid domain name (domain: amd.com, ip: 40.93.198.34, mailfrom: sandeep.gundlupet-raju@amd.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qIwfAwL0CYmXqOpQgfdMGFsttpEUdfRRIJom1ZZ6uJbwzMh9dJkErDlO8WJxIndOpaDizRPOi/L0uR+vni9SKj43nDjIYDigKxsp+AAKzDAxyMptI/5KPr+tk5cxnHPpdvwuOQWbPpibsRNBkgOUowsGo/I0KeVsLZ/iAQiq/leAMqwXrqwbajO7qzXQhzUzNZpSASvrt8NCYNY1Uaotd85BLlrtHt5Dvq7okvSu3Cx7/sm4rPpHjk/K+/SjPU5YmeWluresk02B4wProcHgmn8xTbhJmUxoe3AkiTwiz++JHh/yBxTF9XARyceolnspT9+jDHud/fqXr4LnQ6nCXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iCOo6i3L3jywv0NzEs33nuDWDAQyMZ9nf3FcTwjKvVI=; b=zKFoLVAUNFgMgfJu3/KQ39LEPPnMd3Z1ZeavAFozglSnY9B6rhWdQeGqOMNs31pSRUwLE+AqaF+rz6izTZS3mRacK5u9bGSU5+6gXFK4nKNbyfgqylYsp7fW0VGt9IfIJCtB61IHYihW0k9KOOmjCWT1WuuCZBBPon74/gGSS7S2KnE6Vslol2XLVdsLPPqdNZy54SGDjY92uXgHiwbLdda3srjBtMXnpKQFhzb+m3S1umFf8wdEJ+zx2xfG48ykSUqmuIuXywnK9LJID/f9JWPe2m4UJGZkMwdWYKHCp7diTXDbWKEif5q0N9fG3QP7Pn0Qdry5adIO1SyfRdNTXQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.yoctoproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iCOo6i3L3jywv0NzEs33nuDWDAQyMZ9nf3FcTwjKvVI=; b=kb88lMzkySwQY+E6mBkriExshA7WUSqQh02nOvnhBAJEs9Kwzfr/q2EwsneXNvWMmJZTDYdTeP5gJAQxDghsCb/vX0txKynX9uKDM93vdRyq5itjVG1BO9nGz+wZm3iCsEnd8OjtjQr/wpcDzXXYE6geIV1l6ZBKJQM2Ncmn+sU= Received: from PH8P223CA0002.NAMP223.PROD.OUTLOOK.COM (2603:10b6:510:2db::8) by SA1PR12MB6870.namprd12.prod.outlook.com (2603:10b6:806:25e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.20; Mon, 6 Apr 2026 17:29:59 +0000 Received: from SN1PEPF000252A0.namprd05.prod.outlook.com (2603:10b6:510:2db:cafe::9c) by PH8P223CA0002.outlook.office365.com (2603:10b6:510:2db::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.9769.32 via Frontend Transport; Mon, 6 Apr 2026 17:29:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=satlexmb08.amd.com; pr=C Received: from satlexmb08.amd.com (165.204.84.17) by SN1PEPF000252A0.mail.protection.outlook.com (10.167.242.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9769.17 via Frontend Transport; Mon, 6 Apr 2026 17:29:59 +0000 Received: from satlexmb07.amd.com (10.181.42.216) by satlexmb08.amd.com (10.181.42.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.17; Mon, 6 Apr 2026 12:29:54 -0500 Received: from xcosantraju40.xilinx.com (10.180.168.240) by satlexmb07.amd.com (10.181.42.216) with Microsoft SMTP Server id 15.2.2562.17 via Frontend Transport; Mon, 6 Apr 2026 12:29:54 -0500 From: Sandeep Gundlupet Raju To: CC: , Subject: [layerindex-web][PATCH v2 4/4] README: Document --app-dir option usage Date: Mon, 6 Apr 2026 11:30:10 -0600 Message-ID: <20260406173010.1366742-5-sandeep.gundlupet-raju@amd.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> References: <20260406173010.1366742-1-sandeep.gundlupet-raju@amd.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF000252A0:EE_|SA1PR12MB6870:EE_ X-MS-Office365-Filtering-Correlation-Id: 791951d5-0f43-4da4-ec7f-08de940220d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|82310400026|36860700016|376014|13003099007|18002099003|56012099003|22082099003; X-Microsoft-Antispam-Message-Info: Mc93YHYdaqYJgEcS1NiZeG88eqnK1JGjjcVP1kQwFizYY6EJKM+ylhAUUhwsZrbjYNZm9idgm+P+tOw9PHCG8xvCnusMv9/Ag4BWNHUBmR2kFCbvASwf40zodGn++di8267Gm+r49Z50y5PJcG3K7d1HrEQBZHpeFiLr5x4DXZPdrnFXpVkNcLRtHVizUjJ1ZCE9psAJ3Io6w5nt06t+ko9uYI0dr20QrCku9EZgLoBNsB0N8Rh/O+1TKnDWMJStFNpdNa45y0z3cFZ7zKaUrdRXoy3ljO3/wuiN0Q08JiTlYan8EbjpEHyeRwLTuhgmL8qFvPXZabceY9EuJ9/Mtfk9zUVcrJuHwP5N/lTd2MYy37h88Gw8cfG6apUggNmqM45FkCk0wBMqeYvoJXQoI0mhC9scL85g/EQeQUG/KyCd+7f6PI6jZqGXgfnjft16RiDhWQmGndfdQ3vb/7vgpitdmdW1wAyvoKeP2Xj6ApClYgEJx1v7R4MNWqjUpgY5S0CwaqArTHsomktm+FDtGAZXvGtDrQPRL6xI167qBxQ0W+eBSHvHe/D0hx5cUIrgh4zK8U0y4cUSrELYFt/KGE6O+GCVxIfJEUiU+MBc67OHQGZZ224on9iY6Jz/EVH4hZhmIuZSrnLJeiHlk/8Y5eKYTixvRUz+ZrHC9JgoBNKxPIlD12NPmwN0E1wfJI11RUcymOA75+miyIWy6SVKEw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:satlexmb08.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(82310400026)(36860700016)(376014)(13003099007)(18002099003)(56012099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4cVwSxIHP6uyvnVYG9BAlSk0fjyUdoEj1jRR74xOl8JsP1QJWXsN9lLCRES5lerOLbHVLuCKqGhGtMB5ZtEzuEU7dV0weXuq/cyvrbix6rSGBKsRdnLNzPNeTbDuWYnnZttrFIHF9dpSAph1/Aw5qk6kbqqu7jf1efcO2eUM5fNdAVoT3m/oADMVtY3BYm/FoFWTTo8zTEkVnSWyyaFBj57aItKbVqbvNewnAuXO43HmzOsCbWmjXNg9YJPNC1LHaF/KEI+g8nh4q6YwZrFQG1jbw+VWuV1ALUlbtYiXKI1U6J+40NAI7ySvkMuBAzpXp6x1199TpbS1QMMQFUqfqH/1TI1UPrH2bGUs1oNa0wBsS4SbQyzvDJize0j1PSHLBCO7+gOsIWzmf/aFrtJzp346M7xPd3KoR/t3+FItXqYF8z3CdqAMBOwUVAiN8iiR X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Apr 2026 17:29:59.4373 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 791951d5-0f43-4da4-ec7f-08de940220d6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[satlexmb08.amd.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF000252A0.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6870 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 06 Apr 2026 17:30:08 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/yocto-patches/message/3648 Update README to reflect the new --app-dir support added to dockersetup.py: - Step 2: Add a note explaining that the default installation base directory inside the containers is /opt (requiring the repo to be cloned at /opt/layerindex), and document the --app-dir option for using a custom directory (e.g. when the repo is cloned to a non-default path) - Database Setup: add note to replace /opt with --app-dir value if used - Updating OE data: add same note - Security section: add reminder to substitute --app-dir value in the changepassword and axes_reset commands AI-Generated: GitHub Copilot (Claude Sonnet 4.6) Signed-off-by: Sandeep Gundlupet Raju --- Changes in v2: - None --- README | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-) diff --git a/README b/README index 1335b7a..e40ff25 100644 --- a/README +++ b/README @@ -49,6 +49,19 @@ instructions will walk you through the setup. ./dockersetup.py -d ~/databasedump.sql -p http://: + NOTE: By default, the application is installed inside the containers under + /opt (e.g. /opt/layerindex, /opt/migrate.sh). This means you should clone + this repository into /opt/layerindex on the host before running the script, + or alternatively use the --app-dir option to specify a different base + directory inside the container: + + ./dockersetup.py --app-dir /path/to/appdir + + For example, if you have cloned the repository to + /scratch2/myuser/layerindex-web, you would run: + + ./dockersetup.py --app-dir /scratch2/myuser/layerindex-web + NOTE: If you want email sending to work (required for user registration and password resets), you should use the -e/--email-host option to specify your outgoing email server. @@ -99,11 +112,14 @@ Database Setup Once the application is running you'll need to do a bit of further setup within it: +NOTE: The following commands use /opt as the default base directory. If you +ran dockersetup.py with --app-dir, replace /opt with the value you specified. + 1. For a fresh database (without importing any database dump) you will need layer data. To import the full set for the master branch from the public instance at layers.openembedded.org you can run the following: - docker-compose run --rm layersapp /opt/layerindex/layerindex/tools/import_layers.py https://layers.openembedded.org + docker-compose -f docker-compose.yml run --rm layersapp /opt/layerindex/layerindex/tools/import_layers.py https://layers.openembedded.org Alternatively, you can populate the database manually - you'll need to add at least the openembedded-core layer to the @@ -169,19 +185,22 @@ You will likely want to update the OpenEmbedded layer information on a regular basis. To do that by fetching and parsing all layer repositories, run the following: +NOTE: The following commands use /opt as the default base directory. If you +ran dockersetup.py with --app-dir, replace /opt with the value you specified. + Incremental update: - docker-compose run --rm layersapp /opt/layerindex/layerindex/update.py + docker-compose -f docker-compose.yml run --rm layersapp /opt/layerindex/layerindex/update.py Reload all data (should only be needed if the database structure has changed as part of an upgrade of the application code): - docker-compose run --rm layersapp /opt/layerindex/layerindex/update.py -r + docker-compose -f docker-compose.yml run --rm layersapp /opt/layerindex/layerindex/update.py -r Alternatively, you can update the data from an existing layer index instance (as per above during setup): - docker-compose run --rm layersapp /opt/layerindex/layerindex/tools/import_layers.py https://layers.openembedded.org + docker-compose -f docker-compose.yml run --rm layersapp /opt/layerindex/layerindex/tools/import_layers.py https://layers.openembedded.org @@ -356,7 +375,9 @@ REGISTRATION_OPEN = False reset function ( /accounts/password_reset/ ) or alternatively from the backend you can run the following command: - docker-compose exec layersapp /opt/layerindex/manage.py changepassword + docker-compose -f docker-compose.yml exec layersapp /opt/layerindex/manage.py changepassword + + (Replace /opt with your --app-dir value if you used a custom directory.) * The web-based password reset function will ask the user answers to security questions they selected and answered when they created the @@ -387,7 +408,9 @@ REGISTRATION_OPEN = False (default 4, resets after an hour). The lockout can be removed immediately using the following command: - docker-compose exec layersapp /opt/layerindex/manage.py axes_reset + docker-compose -f docker-compose.yml exec layersapp /opt/layerindex/manage.py axes_reset + + (Replace /opt with your --app-dir value if you used a custom directory.) If you wish to disable this, remove or comment out "axes" in INSTALLED_APPS. For more information on configuring axes, see: @@ -412,12 +435,12 @@ To back up the database within the docker-based setup, you can run the following command (no need to substitute ${MYSQL_ROOT_PASSWORD}, it's already present within the container environment): -docker-compose exec layersdb /bin/sh -c '/usr/bin/mariadb-dump -u root --password=${MYSQL_ROOT_PASSWORD} --max_allowed_packet=512M layersdb' | gzip > backup-`date +%Y_%m_%d_%H%M`.sql.gz +docker-compose -f docker-compose.yml exec layersdb /bin/sh -c '/usr/bin/mariadb-dump -u root --password=${MYSQL_ROOT_PASSWORD} --max_allowed_packet=512M layersdb' | gzip > backup-`date +%Y_%m_%d_%H%M`.sql.gz To restore one of these backups you would run the following command (take care, this will overwrite the data immediately without prompting!): -zcat backupfile.sql.gz | docker-compose exec -T layersdb /bin/sh -c '/usr/bin/mariadb -u root --password=${MYSQL_ROOT_PASSWORD} layersdb' +zcat backupfile.sql.gz | docker-compose -f docker-compose.yml exec -T layersdb /bin/sh -c '/usr/bin/mariadb -u root --password=${MYSQL_ROOT_PASSWORD} layersdb'