New lorax documentation - 32.12

Automatic commit of package [lorax] release [32.12-1].
Created by command: /usr/bin/tito tag
2020-10-01 16:14:24 -07:00 · 2020-07-20 10:54:35 -07:00 · 2020-07-20 10:31:10 -07:00 · 2020-07-20 10:30:54 -07:00 · 2020-06-18 14:32:28 -07:00 · 2020-06-18 14:31:33 -07:00
115 changed files with 1429 additions and 280 deletions
--- a/Dockerfile.test
+++ b/Dockerfile.test
@ -1,4 +1,4 @@
-FROM registry.fedoraproject.org/fedora:rawhide
+FROM registry.fedoraproject.org/fedora:32
 COPY test-packages .
 RUN dnf -y install $(cat test-packages) && touch /.in-container
 RUN useradd weldr
--- a/docs/html/.buildinfo
+++ b/docs/html/.buildinfo
@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 896b7bb546ecaa644c5791bfa9831083
+config: c4915faa43645ef53e2c72f589eb92b8
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/html/.doctrees/composer-cli.doctree
+++ b/docs/html/.doctrees/composer-cli.doctree
--- a/docs/html/.doctrees/composer.cli.doctree
+++ b/docs/html/.doctrees/composer.cli.doctree
--- a/docs/html/.doctrees/composer.doctree
+++ b/docs/html/.doctrees/composer.doctree
--- a/docs/html/.doctrees/environment.pickle
+++ b/docs/html/.doctrees/environment.pickle
--- a/docs/html/.doctrees/lorax-composer.doctree
+++ b/docs/html/.doctrees/lorax-composer.doctree
--- a/docs/html/.doctrees/lorax.doctree
+++ b/docs/html/.doctrees/lorax.doctree
--- a/docs/html/.doctrees/pylorax.doctree
+++ b/docs/html/.doctrees/pylorax.doctree
--- a/docs/html/_modules/composer/cli.html
+++ b/docs/html/_modules/composer/cli.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/blueprints.html
+++ b/docs/html/_modules/composer/cli/blueprints.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.blueprints &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.blueprints &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/cmdline.html
+++ b/docs/html/_modules/composer/cli/cmdline.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.cmdline &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.cmdline &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/compose.html
+++ b/docs/html/_modules/composer/cli/compose.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.compose &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.compose &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -194,7 +194,18 @@
 <span class="sd">    :rtype: int</span>

 <span class="sd">    This dispatches the compose commands to a function</span>
+
+<span class="sd">    compose_cmd expects api to be passed. eg.</span>
+
+<span class="sd">        {&quot;version&quot;: 1, &quot;backend&quot;: &quot;lorax-composer&quot;}</span>
+
 <span class="sd">    &quot;&quot;&quot;</span>
+    <span class="n">result</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">get_url_json</span><span class="p">(</span><span class="n">opts</span><span class="o">.</span><span class="n">socket</span><span class="p">,</span> <span class="s2">&quot;/api/status&quot;</span><span class="p">)</span>
+    <span class="c1"># Get the api version and fall back to 0 if it fails.</span>
+    <span class="n">api_version</span> <span class="o">=</span> <span class="n">result</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;api&quot;</span><span class="p">,</span> <span class="s2">&quot;0&quot;</span><span class="p">)</span>
+    <span class="n">backend</span> <span class="o">=</span> <span class="n">result</span><span class="o">.</span><span class="n">get</span><span class="p">(</span><span class="s2">&quot;backend&quot;</span><span class="p">,</span> <span class="s2">&quot;unknown&quot;</span><span class="p">)</span>
+    <span class="n">api</span> <span class="o">=</span> <span class="p">{</span><span class="s2">&quot;version&quot;</span><span class="p">:</span> <span class="n">api_version</span><span class="p">,</span> <span class="s2">&quot;backend&quot;</span><span class="p">:</span> <span class="n">backend</span><span class="p">}</span>
+
    <span class="n">cmd_map</span> <span class="o">=</span> <span class="p">{</span>
        <span class="s2">&quot;list&quot;</span><span class="p">:</span>     <span class="n">compose_list</span><span class="p">,</span>
        <span class="s2">&quot;status&quot;</span><span class="p">:</span>   <span class="n">compose_status</span><span class="p">,</span>
@ -208,6 +219,7 @@
        <span class="s2">&quot;results&quot;</span><span class="p">:</span>  <span class="n">compose_results</span><span class="p">,</span>
        <span class="s2">&quot;logs&quot;</span><span class="p">:</span>     <span class="n">compose_logs</span><span class="p">,</span>
        <span class="s2">&quot;image&quot;</span><span class="p">:</span>    <span class="n">compose_image</span><span class="p">,</span>
+        <span class="s2">&quot;start-ostree&quot;</span><span class="p">:</span>    <span class="n">compose_ostree</span><span class="p">,</span>
        <span class="p">}</span>
    <span class="k">if</span> <span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;help&quot;</span> <span class="ow">or</span> <span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;--help&quot;</span><span class="p">:</span>
        <span class="nb">print</span><span class="p">(</span><span class="n">compose_help</span><span class="p">)</span>
@ -216,9 +228,39 @@
        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;Unknown compose command: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span>
        <span class="k">return</span> <span class="mi">1</span>

-    <span class="k">return</span> <span class="n">cmd_map</span><span class="p">[</span><span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">]](</span><span class="n">opts</span><span class="o">.</span><span class="n">socket</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">api_version</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">2</span><span class="p">:],</span> <span class="n">opts</span><span class="o">.</span><span class="n">json</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">testmode</span><span class="p">)</span></div>
+    <span class="k">return</span> <span class="n">cmd_map</span><span class="p">[</span><span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">]](</span><span class="n">opts</span><span class="o">.</span><span class="n">socket</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">api_version</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">args</span><span class="p">[</span><span class="mi">2</span><span class="p">:],</span> <span class="n">opts</span><span class="o">.</span><span class="n">json</span><span class="p">,</span> <span class="n">opts</span><span class="o">.</span><span class="n">testmode</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="n">api</span><span class="p">)</span></div>

-<div class="viewcode-block" id="compose_list"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_list">[docs]</a><span class="k">def</span> <span class="nf">compose_list</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="get_size"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.get_size">[docs]</a><span class="k">def</span> <span class="nf">get_size</span><span class="p">(</span><span class="n">args</span><span class="p">):</span>
+    <span class="sd">&quot;&quot;&quot;Return optional size argument, and remaining args</span>
+
+<span class="sd">    :param api: Details about the API server, &quot;version&quot; and &quot;backend&quot;</span>
+<span class="sd">    :type api: dict</span>
+<span class="sd">    :returns: (args, size)</span>
+<span class="sd">    :rtype: tuple</span>
+
+<span class="sd">    - check size argument for int</span>
+<span class="sd">    - check other args for --size in wrong place</span>
+<span class="sd">    - raise error? Or just return 0?</span>
+<span class="sd">    - no size returns 0 in size</span>
+<span class="sd">    - multiply by 1024**2 to make it easier on users to specify large sizes</span>
+
+<span class="sd">    &quot;&quot;&quot;</span>
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
+        <span class="k">return</span> <span class="p">(</span><span class="n">args</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+    <span class="k">if</span> <span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">!=</span> <span class="s2">&quot;--size&quot;</span> <span class="ow">and</span> <span class="s2">&quot;--size&quot;</span> <span class="ow">in</span> <span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">:]:</span>
+        <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="s2">&quot;--size must be first argument after the command&quot;</span><span class="p">)</span>
+    <span class="k">if</span> <span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span> <span class="o">!=</span> <span class="s2">&quot;--size&quot;</span><span class="p">:</span>
+        <span class="k">return</span> <span class="p">(</span><span class="n">args</span><span class="p">,</span> <span class="mi">0</span><span class="p">)</span>
+
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">&lt;</span> <span class="mi">2</span><span class="p">:</span>
+        <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="s2">&quot;--size is missing the value, in MiB&quot;</span><span class="p">)</span>
+
+    <span class="c1"># Let this raise an error for non-digit input</span>
+    <span class="n">size</span> <span class="o">=</span> <span class="nb">int</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">])</span>
+    <span class="k">return</span> <span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">2</span><span class="p">:],</span> <span class="n">size</span> <span class="o">*</span> <span class="mi">1024</span><span class="o">**</span><span class="mi">2</span><span class="p">)</span></div>
+
+<div class="viewcode-block" id="compose_list"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_list">[docs]</a><span class="k">def</span> <span class="nf">compose_list</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Return a simple list of compose identifiers&quot;&quot;&quot;</span>

    <span class="n">states</span> <span class="o">=</span> <span class="p">(</span><span class="s2">&quot;running&quot;</span><span class="p">,</span> <span class="s2">&quot;waiting&quot;</span><span class="p">,</span> <span class="s2">&quot;finished&quot;</span><span class="p">,</span> <span class="s2">&quot;failed&quot;</span><span class="p">)</span>
@ -262,7 +304,7 @@

    <span class="k">return</span> <span class="mi">0</span></div>

-<div class="viewcode-block" id="compose_status"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_status">[docs]</a><span class="k">def</span> <span class="nf">compose_status</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_status"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_status">[docs]</a><span class="k">def</span> <span class="nf">compose_status</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Return the status of all known composes</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -332,7 +374,7 @@
                                                <span class="n">c</span><span class="p">[</span><span class="s2">&quot;version&quot;</span><span class="p">],</span> <span class="n">c</span><span class="p">[</span><span class="s2">&quot;compose_type&quot;</span><span class="p">],</span> <span class="n">image_size</span><span class="p">))</span></div>


-<div class="viewcode-block" id="compose_types"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_types">[docs]</a><span class="k">def</span> <span class="nf">compose_types</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_types"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_types">[docs]</a><span class="k">def</span> <span class="nf">compose_types</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Return information about the supported compose types</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -358,7 +400,7 @@
    <span class="c1"># output a plain list of identifiers, one per line</span>
    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="n">t</span><span class="p">[</span><span class="s2">&quot;name&quot;</span><span class="p">]</span> <span class="k">for</span> <span class="n">t</span> <span class="ow">in</span> <span class="n">result</span><span class="p">[</span><span class="s2">&quot;types&quot;</span><span class="p">]</span> <span class="k">if</span> <span class="n">t</span><span class="p">[</span><span class="s2">&quot;enabled&quot;</span><span class="p">]))</span></div>

-<div class="viewcode-block" id="compose_start"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_start">[docs]</a><span class="k">def</span> <span class="nf">compose_start</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_start"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_start">[docs]</a><span class="k">def</span> <span class="nf">compose_start</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Start a new compose using the selected blueprint and type</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -371,9 +413,22 @@
 <span class="sd">    :type show_json: bool</span>
 <span class="sd">    :param testmode: Set to 1 to simulate a failed compose, set to 2 to simulate a finished one.</span>
 <span class="sd">    :type testmode: int</span>
+<span class="sd">    :param api: Details about the API server, &quot;version&quot; and &quot;backend&quot;</span>
+<span class="sd">    :type api: dict</span>

-<span class="sd">    compose start &lt;blueprint-name&gt; &lt;compose-type&gt; [&lt;image-name&gt; &lt;provider&gt; &lt;profile&gt; | &lt;image-name&gt; &lt;profile.toml&gt;]</span>
+<span class="sd">    compose start [--size XXX] &lt;blueprint-name&gt; &lt;compose-type&gt; [&lt;image-name&gt; &lt;provider&gt; &lt;profile&gt; | &lt;image-name&gt; &lt;profile.toml&gt;]</span>
 <span class="sd">    &quot;&quot;&quot;</span>
+    <span class="k">if</span> <span class="n">api</span> <span class="o">==</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;Missing api version/backend&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+
+    <span class="c1"># Get the optional size before checking other parameters</span>
+    <span class="k">try</span><span class="p">:</span>
+        <span class="n">args</span><span class="p">,</span> <span class="n">size</span> <span class="o">=</span> <span class="n">get_size</span><span class="p">(</span><span class="n">args</span><span class="p">)</span>
+    <span class="k">except</span> <span class="p">(</span><span class="ne">RuntimeError</span><span class="p">,</span> <span class="ne">ValueError</span><span class="p">)</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">e</span><span class="p">))</span>
+        <span class="k">return</span> <span class="mi">1</span>
+
    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;start is missing the blueprint name and output type&quot;</span><span class="p">)</span>
        <span class="k">return</span> <span class="mi">1</span>
@ -389,6 +444,12 @@
        <span class="s2">&quot;compose_type&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span>
        <span class="s2">&quot;branch&quot;</span><span class="p">:</span> <span class="s2">&quot;master&quot;</span>
        <span class="p">}</span>
+    <span class="k">if</span> <span class="n">size</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
+        <span class="k">if</span> <span class="n">api</span><span class="p">[</span><span class="s2">&quot;backend&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;lorax-composer&quot;</span><span class="p">:</span>
+            <span class="n">log</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="s2">&quot;lorax-composer does not support --size, it will be ignored.&quot;</span><span class="p">)</span>
+        <span class="k">else</span><span class="p">:</span>
+            <span class="n">config</span><span class="p">[</span><span class="s2">&quot;size&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">size</span>
+
    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">4</span><span class="p">:</span>
        <span class="n">config</span><span class="p">[</span><span class="s2">&quot;upload&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="s2">&quot;image_name&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">2</span><span class="p">]}</span>
        <span class="c1"># profile TOML file (maybe)</span>
@ -421,7 +482,97 @@

    <span class="k">return</span> <span class="n">rc</span></div>

-<div class="viewcode-block" id="compose_log"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_log">[docs]</a><span class="k">def</span> <span class="nf">compose_log</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_ostree"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_ostree">[docs]</a><span class="k">def</span> <span class="nf">compose_ostree</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
+    <span class="sd">&quot;&quot;&quot;Start a new compose using the selected blueprint and type</span>
+
+<span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
+<span class="sd">    :type socket_path: str</span>
+<span class="sd">    :param api_version: Version of the API to talk to. eg. &quot;0&quot;</span>
+<span class="sd">    :type api_version: str</span>
+<span class="sd">    :param args: List of remaining arguments from the cmdline</span>
+<span class="sd">    :type args: list of str</span>
+<span class="sd">    :param show_json: Set to True to show the JSON output instead of the human readable output</span>
+<span class="sd">    :type show_json: bool</span>
+<span class="sd">    :param testmode: Set to 1 to simulate a failed compose, set to 2 to simulate a finished one.</span>
+<span class="sd">    :type testmode: int</span>
+<span class="sd">    :param api: Details about the API server, &quot;version&quot; and &quot;backend&quot;</span>
+<span class="sd">    :type api: dict</span>
+
+<span class="sd">    compose start [--size XXX] &lt;blueprint-name&gt; &lt;compose-type&gt; &lt;ostree-ref&gt; &lt;ostree-parent&gt; [&lt;image-name&gt; &lt;provider&gt; &lt;profile&gt; | &lt;image-name&gt; &lt;profile.toml&gt;]</span>
+<span class="sd">    &quot;&quot;&quot;</span>
+    <span class="k">if</span> <span class="n">api</span> <span class="o">==</span> <span class="kc">None</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;Missing api version/backend&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+
+    <span class="k">if</span> <span class="n">api</span><span class="p">[</span><span class="s2">&quot;backend&quot;</span><span class="p">]</span> <span class="o">==</span> <span class="s2">&quot;lorax-composer&quot;</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">warning</span><span class="p">(</span><span class="s2">&quot;lorax-composer doesn not support start-ostree.&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+
+    <span class="c1"># Get the optional size before checking other parameters</span>
+    <span class="k">try</span><span class="p">:</span>
+        <span class="n">args</span><span class="p">,</span> <span class="n">size</span> <span class="o">=</span> <span class="n">get_size</span><span class="p">(</span><span class="n">args</span><span class="p">)</span>
+    <span class="k">except</span> <span class="p">(</span><span class="ne">RuntimeError</span><span class="p">,</span> <span class="ne">ValueError</span><span class="p">)</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">e</span><span class="p">))</span>
+        <span class="k">return</span> <span class="mi">1</span>
+
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;start-ostree is missing the blueprint name, output type, and ostree details&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">1</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;start-ostree is missing the output type&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">2</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;start-ostree is missing the ostree reference&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">3</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;start-ostree is missing the ostree parent&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">5</span><span class="p">:</span>
+        <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;start-ostree is missing the provider and profile details&quot;</span><span class="p">)</span>
+        <span class="k">return</span> <span class="mi">1</span>
+
+    <span class="n">config</span> <span class="o">=</span> <span class="p">{</span>
+        <span class="s2">&quot;blueprint_name&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">0</span><span class="p">],</span>
+        <span class="s2">&quot;compose_type&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">1</span><span class="p">],</span>
+        <span class="s2">&quot;branch&quot;</span><span class="p">:</span> <span class="s2">&quot;master&quot;</span><span class="p">,</span>
+        <span class="s2">&quot;ostree&quot;</span><span class="p">:</span> <span class="p">{</span><span class="s2">&quot;ref&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">2</span><span class="p">],</span> <span class="s2">&quot;parent&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">3</span><span class="p">]},</span>
+        <span class="p">}</span>
+    <span class="k">if</span> <span class="n">size</span> <span class="o">&gt;</span> <span class="mi">0</span><span class="p">:</span>
+        <span class="n">config</span><span class="p">[</span><span class="s2">&quot;size&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="n">size</span>
+
+    <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">6</span><span class="p">:</span>
+        <span class="n">config</span><span class="p">[</span><span class="s2">&quot;upload&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span><span class="s2">&quot;image_name&quot;</span><span class="p">:</span> <span class="n">args</span><span class="p">[</span><span class="mi">4</span><span class="p">]}</span>
+        <span class="c1"># profile TOML file (maybe)</span>
+        <span class="k">try</span><span class="p">:</span>
+            <span class="n">config</span><span class="p">[</span><span class="s2">&quot;upload&quot;</span><span class="p">]</span><span class="o">.</span><span class="n">update</span><span class="p">(</span><span class="n">toml</span><span class="o">.</span><span class="n">load</span><span class="p">(</span><span class="n">args</span><span class="p">[</span><span class="mi">5</span><span class="p">]))</span>
+        <span class="k">except</span> <span class="n">toml</span><span class="o">.</span><span class="n">TomlDecodeError</span> <span class="k">as</span> <span class="n">e</span><span class="p">:</span>
+            <span class="n">log</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="nb">str</span><span class="p">(</span><span class="n">e</span><span class="p">))</span>
+            <span class="k">return</span> <span class="mi">1</span>
+    <span class="k">elif</span> <span class="nb">len</span><span class="p">(</span><span class="n">args</span><span class="p">)</span> <span class="o">==</span> <span class="mi">7</span><span class="p">:</span>
+        <span class="n">config</span><span class="p">[</span><span class="s2">&quot;upload&quot;</span><span class="p">]</span> <span class="o">=</span> <span class="p">{</span>
+            <span class="s2">&quot;image_name&quot;</span><span class="p">:</span>  <span class="n">args</span><span class="p">[</span><span class="mi">4</span><span class="p">],</span>
+            <span class="s2">&quot;provider&quot;</span><span class="p">:</span>  <span class="n">args</span><span class="p">[</span><span class="mi">5</span><span class="p">],</span>
+            <span class="s2">&quot;profile&quot;</span><span class="p">:</span>  <span class="n">args</span><span class="p">[</span><span class="mi">6</span><span class="p">]</span>
+        <span class="p">}</span>
+
+    <span class="k">if</span> <span class="n">testmode</span><span class="p">:</span>
+        <span class="n">test_url</span> <span class="o">=</span> <span class="s2">&quot;?test=</span><span class="si">%d</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">testmode</span>
+    <span class="k">else</span><span class="p">:</span>
+        <span class="n">test_url</span> <span class="o">=</span> <span class="s2">&quot;&quot;</span>
+    <span class="n">api_route</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">api_url</span><span class="p">(</span><span class="n">api_version</span><span class="p">,</span> <span class="s2">&quot;/compose&quot;</span> <span class="o">+</span> <span class="n">test_url</span><span class="p">)</span>
+    <span class="n">result</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">post_url_json</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_route</span><span class="p">,</span> <span class="n">json</span><span class="o">.</span><span class="n">dumps</span><span class="p">(</span><span class="n">config</span><span class="p">))</span>
+    <span class="p">(</span><span class="n">rc</span><span class="p">,</span> <span class="n">exit_now</span><span class="p">)</span> <span class="o">=</span> <span class="n">handle_api_result</span><span class="p">(</span><span class="n">result</span><span class="p">,</span> <span class="n">show_json</span><span class="p">)</span>
+    <span class="k">if</span> <span class="n">exit_now</span><span class="p">:</span>
+        <span class="k">return</span> <span class="n">rc</span>
+
+    <span class="nb">print</span><span class="p">(</span><span class="s2">&quot;Compose </span><span class="si">%s</span><span class="s2"> added to the queue&quot;</span> <span class="o">%</span> <span class="n">result</span><span class="p">[</span><span class="s2">&quot;build_id&quot;</span><span class="p">])</span>
+
+    <span class="k">if</span> <span class="s2">&quot;upload_id&quot;</span> <span class="ow">in</span> <span class="n">result</span> <span class="ow">and</span> <span class="n">result</span><span class="p">[</span><span class="s2">&quot;upload_id&quot;</span><span class="p">]:</span>
+        <span class="nb">print</span> <span class="p">(</span><span class="s2">&quot;Upload </span><span class="si">%s</span><span class="s2"> added to the upload queue&quot;</span> <span class="o">%</span> <span class="n">result</span><span class="p">[</span><span class="s2">&quot;upload_id&quot;</span><span class="p">])</span>
+
+    <span class="k">return</span> <span class="n">rc</span></div>
+
+<div class="viewcode-block" id="compose_log"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_log">[docs]</a><span class="k">def</span> <span class="nf">compose_log</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Show the last part of the compose log</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -462,7 +613,7 @@
    <span class="nb">print</span><span class="p">(</span><span class="n">result</span><span class="p">)</span>
    <span class="k">return</span> <span class="mi">0</span></div>

-<div class="viewcode-block" id="compose_cancel"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_cancel">[docs]</a><span class="k">def</span> <span class="nf">compose_cancel</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_cancel"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_cancel">[docs]</a><span class="k">def</span> <span class="nf">compose_cancel</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Cancel a running compose</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -488,7 +639,7 @@
    <span class="n">result</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">delete_url_json</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_route</span><span class="p">)</span>
    <span class="k">return</span> <span class="n">handle_api_result</span><span class="p">(</span><span class="n">result</span><span class="p">,</span> <span class="n">show_json</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span></div>

-<div class="viewcode-block" id="compose_delete"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_delete">[docs]</a><span class="k">def</span> <span class="nf">compose_delete</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_delete"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_delete">[docs]</a><span class="k">def</span> <span class="nf">compose_delete</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Delete a finished compose&#39;s results</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -515,7 +666,7 @@
    <span class="n">result</span> <span class="o">=</span> <span class="n">client</span><span class="o">.</span><span class="n">delete_url_json</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_route</span><span class="p">)</span>
    <span class="k">return</span> <span class="n">handle_api_result</span><span class="p">(</span><span class="n">result</span><span class="p">,</span> <span class="n">show_json</span><span class="p">)[</span><span class="mi">0</span><span class="p">]</span></div>

-<div class="viewcode-block" id="compose_info"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_info">[docs]</a><span class="k">def</span> <span class="nf">compose_info</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_info"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_info">[docs]</a><span class="k">def</span> <span class="nf">compose_info</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Return detailed information about the compose</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -569,7 +720,7 @@

    <span class="k">return</span> <span class="n">rc</span></div>

-<div class="viewcode-block" id="compose_metadata"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_metadata">[docs]</a><span class="k">def</span> <span class="nf">compose_metadata</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_metadata"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_metadata">[docs]</a><span class="k">def</span> <span class="nf">compose_metadata</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Download a tar file of the compose&#39;s metadata</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -600,7 +751,7 @@

    <span class="k">return</span> <span class="n">rc</span></div>

-<div class="viewcode-block" id="compose_results"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_results">[docs]</a><span class="k">def</span> <span class="nf">compose_results</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_results"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_results">[docs]</a><span class="k">def</span> <span class="nf">compose_results</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Download a tar file of the compose&#39;s results</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -632,7 +783,7 @@

    <span class="k">return</span> <span class="n">rc</span></div>

-<div class="viewcode-block" id="compose_logs"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_logs">[docs]</a><span class="k">def</span> <span class="nf">compose_logs</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_logs"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_logs">[docs]</a><span class="k">def</span> <span class="nf">compose_logs</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Download a tar of the compose&#39;s logs</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -663,7 +814,7 @@

    <span class="k">return</span> <span class="n">rc</span></div>

-<div class="viewcode-block" id="compose_image"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_image">[docs]</a><span class="k">def</span> <span class="nf">compose_image</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">):</span>
+<div class="viewcode-block" id="compose_image"><a class="viewcode-back" href="../../../composer.cli.html#composer.cli.compose.compose_image">[docs]</a><span class="k">def</span> <span class="nf">compose_image</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">api_version</span><span class="p">,</span> <span class="n">args</span><span class="p">,</span> <span class="n">show_json</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span> <span class="n">testmode</span><span class="o">=</span><span class="mi">0</span><span class="p">,</span> <span class="n">api</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Download the compose&#39;s output image</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
--- a/docs/html/_modules/composer/cli/modules.html
+++ b/docs/html/_modules/composer/cli/modules.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.modules &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.modules &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/projects.html
+++ b/docs/html/_modules/composer/cli/projects.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.projects &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.projects &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/providers.html
+++ b/docs/html/_modules/composer/cli/providers.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.providers &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.providers &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/sources.html
+++ b/docs/html/_modules/composer/cli/sources.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.sources &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.sources &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/status.html
+++ b/docs/html/_modules/composer/cli/status.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.status &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.status &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/upload.html
+++ b/docs/html/_modules/composer/cli/upload.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.upload &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.upload &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/cli/utilities.html
+++ b/docs/html/_modules/composer/cli/utilities.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli.utilities &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli.utilities &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/composer/http_client.html
+++ b/docs/html/_modules/composer/http_client.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.http_client &mdash; Lorax 32.6 documentation</title>
+  <title>composer.http_client &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -283,7 +283,7 @@
    <span class="n">r_unlimited</span> <span class="o">=</span> <span class="n">http</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s2">&quot;GET&quot;</span><span class="p">,</span> <span class="n">unlimited_url</span><span class="p">)</span>
    <span class="k">return</span> <span class="n">json</span><span class="o">.</span><span class="n">loads</span><span class="p">(</span><span class="n">r_unlimited</span><span class="o">.</span><span class="n">data</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="s1">&#39;utf-8&#39;</span><span class="p">))</span></div>

-<div class="viewcode-block" id="delete_url_json"><a class="viewcode-back" href="../../composer.html#composer.http_client.delete_url_json">[docs]</a><span class="k">def</span> <span class="nf">delete_url_json</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">url</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="mi">120</span><span class="p">):</span>
+<div class="viewcode-block" id="delete_url_json"><a class="viewcode-back" href="../../composer.html#composer.http_client.delete_url_json">[docs]</a><span class="k">def</span> <span class="nf">delete_url_json</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">url</span><span class="p">):</span>
    <span class="sd">&quot;&quot;&quot;Send a DELETE request to the url and return JSON response</span>

 <span class="sd">    :param socket_path: Path to the Unix socket to use for API communication</span>
@ -293,7 +293,7 @@
 <span class="sd">    :returns: The json response from the server</span>
 <span class="sd">    :rtype: dict</span>
 <span class="sd">    &quot;&quot;&quot;</span>
-    <span class="n">http</span> <span class="o">=</span> <span class="n">UnixHTTPConnectionPool</span><span class="p">(</span><span class="n">socket_path</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="n">timeout</span><span class="p">)</span>
+    <span class="n">http</span> <span class="o">=</span> <span class="n">UnixHTTPConnectionPool</span><span class="p">(</span><span class="n">socket_path</span><span class="p">)</span>
    <span class="n">r</span> <span class="o">=</span> <span class="n">http</span><span class="o">.</span><span class="n">request</span><span class="p">(</span><span class="s2">&quot;DELETE&quot;</span><span class="p">,</span> <span class="n">url</span><span class="p">)</span>
    <span class="k">return</span> <span class="n">json</span><span class="o">.</span><span class="n">loads</span><span class="p">(</span><span class="n">r</span><span class="o">.</span><span class="n">data</span><span class="o">.</span><span class="n">decode</span><span class="p">(</span><span class="s2">&quot;utf-8&quot;</span><span class="p">))</span></div>

--- a/docs/html/_modules/composer/unix_socket.html
+++ b/docs/html/_modules/composer/unix_socket.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.unix_socket &mdash; Lorax 32.6 documentation</title>
+  <title>composer.unix_socket &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -183,7 +183,7 @@
 <span class="c1"># https://github.com/docker/docker-py/blob/master/docker/transport/unixconn.py</span>
 <div class="viewcode-block" id="UnixHTTPConnection"><a class="viewcode-back" href="../../composer.html#composer.unix_socket.UnixHTTPConnection">[docs]</a><span class="k">class</span> <span class="nc">UnixHTTPConnection</span><span class="p">(</span><span class="n">http</span><span class="o">.</span><span class="n">client</span><span class="o">.</span><span class="n">HTTPConnection</span><span class="p">,</span> <span class="nb">object</span><span class="p">):</span>

-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">socket_path</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="mi">60</span><span class="p">):</span>
+    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">socket_path</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="mi">60</span><span class="o">*</span><span class="mi">5</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;Create an HTTP connection to a unix domain socket</span>

 <span class="sd">        :param socket_path: The path to the Unix domain socket</span>
@ -205,13 +205,15 @@

 <div class="viewcode-block" id="UnixHTTPConnectionPool"><a class="viewcode-back" href="../../composer.html#composer.unix_socket.UnixHTTPConnectionPool">[docs]</a><span class="k">class</span> <span class="nc">UnixHTTPConnectionPool</span><span class="p">(</span><span class="n">urllib3</span><span class="o">.</span><span class="n">connectionpool</span><span class="o">.</span><span class="n">HTTPConnectionPool</span><span class="p">):</span>

-    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">socket_path</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="mi">60</span><span class="p">):</span>
+    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">socket_path</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="mi">60</span><span class="o">*</span><span class="mi">5</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;Create a connection pool using a Unix domain socket</span>

 <span class="sd">        :param socket_path: The path to the Unix domain socket</span>
 <span class="sd">        :param timeout: Number of seconds to timeout the connection</span>
+
+<span class="sd">        NOTE: retries are disabled for these connections, they are never useful</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="nb">super</span><span class="p">(</span><span class="n">UnixHTTPConnectionPool</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="s1">&#39;localhost&#39;</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="n">timeout</span><span class="p">)</span>
+        <span class="nb">super</span><span class="p">(</span><span class="n">UnixHTTPConnectionPool</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="s1">&#39;localhost&#39;</span><span class="p">,</span> <span class="n">timeout</span><span class="o">=</span><span class="n">timeout</span><span class="p">,</span> <span class="n">retries</span><span class="o">=</span><span class="kc">False</span><span class="p">)</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">socket_path</span> <span class="o">=</span> <span class="n">socket_path</span>

    <span class="k">def</span> <span class="nf">_new_conn</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
--- a/docs/html/_modules/index.html
+++ b/docs/html/_modules/index.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Overview: module code &mdash; Lorax 32.6 documentation</title>
+  <title>Overview: module code &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/lifted/config.html
+++ b/docs/html/_modules/lifted/config.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>lifted.config &mdash; Lorax 32.6 documentation</title>
+  <title>lifted.config &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/lifted/providers.html
+++ b/docs/html/_modules/lifted/providers.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>lifted.providers &mdash; Lorax 32.6 documentation</title>
+  <title>lifted.providers &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/lifted/queue.html
+++ b/docs/html/_modules/lifted/queue.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>lifted.queue &mdash; Lorax 32.6 documentation</title>
+  <title>lifted.queue &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/lifted/upload.html
+++ b/docs/html/_modules/lifted/upload.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>lifted.upload &mdash; Lorax 32.6 documentation</title>
+  <title>lifted.upload &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -296,7 +296,7 @@
        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">is_cancellable</span><span class="p">():</span>
            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="n">f</span><span class="s2">&quot;Can&#39;t reset, status is </span><span class="si">{self.status}</span><span class="s2">!&quot;</span><span class="p">)</span>
        <span class="k">if</span> <span class="ow">not</span> <span class="bp">self</span><span class="o">.</span><span class="n">image_path</span><span class="p">:</span>
-            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="n">f</span><span class="s2">&quot;Can&#39;t reset, no image supplied yet!&quot;</span><span class="p">)</span>
+            <span class="k">raise</span> <span class="ne">RuntimeError</span><span class="p">(</span><span class="s2">&quot;Can&#39;t reset, no image supplied yet!&quot;</span><span class="p">)</span>
        <span class="c1"># self.error = None</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_log</span><span class="p">(</span><span class="s2">&quot;Resetting state&quot;</span><span class="p">)</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">set_status</span><span class="p">(</span><span class="s2">&quot;READY&quot;</span><span class="p">,</span> <span class="n">status_callback</span><span class="p">)</span></div>
--- a/docs/html/_modules/pylorax.html
+++ b/docs/html/_modules/pylorax.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -340,7 +340,8 @@
            <span class="n">add_arch_template_vars</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
            <span class="n">verify</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
            <span class="n">user_dracut_args</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
-            <span class="n">squashfs_only</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
+            <span class="n">squashfs_only</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+            <span class="n">skip_branding</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>

        <span class="k">assert</span> <span class="bp">self</span><span class="o">.</span><span class="n">_configured</span>

@ -420,7 +421,8 @@
                            <span class="n">installpkgs</span><span class="o">=</span><span class="n">installpkgs</span><span class="p">,</span>
                            <span class="n">excludepkgs</span><span class="o">=</span><span class="n">excludepkgs</span><span class="p">,</span>
                            <span class="n">add_templates</span><span class="o">=</span><span class="n">add_templates</span><span class="p">,</span>
-                            <span class="n">add_template_vars</span><span class="o">=</span><span class="n">add_template_vars</span><span class="p">)</span>
+                            <span class="n">add_template_vars</span><span class="o">=</span><span class="n">add_template_vars</span><span class="p">,</span>
+                            <span class="n">skip_branding</span><span class="o">=</span><span class="n">skip_branding</span><span class="p">)</span>

        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot;installing runtime packages&quot;</span><span class="p">)</span>
        <span class="n">rb</span><span class="o">.</span><span class="n">install</span><span class="p">()</span>
--- a/docs/html/_modules/pylorax/api/bisect.html
+++ b/docs/html/_modules/pylorax/api/bisect.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.bisect &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.bisect &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/checkparams.html
+++ b/docs/html/_modules/pylorax/api/checkparams.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.checkparams &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.checkparams &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/cmdline.html
+++ b/docs/html/_modules/pylorax/api/cmdline.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.cmdline &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.cmdline &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/compose.html
+++ b/docs/html/_modules/pylorax/api/compose.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.compose &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.compose &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/config.html
+++ b/docs/html/_modules/pylorax/api/config.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.config &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.config &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/dnfbase.html
+++ b/docs/html/_modules/pylorax/api/dnfbase.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.dnfbase &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.dnfbase &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/flask_blueprint.html
+++ b/docs/html/_modules/pylorax/api/flask_blueprint.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.flask_blueprint &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.flask_blueprint &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/gitrpm.html
+++ b/docs/html/_modules/pylorax/api/gitrpm.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.gitrpm &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.gitrpm &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/projects.html
+++ b/docs/html/_modules/pylorax/api/projects.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.projects &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.projects &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/queue.html
+++ b/docs/html/_modules/pylorax/api/queue.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.queue &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.queue &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/recipes.html
+++ b/docs/html/_modules/pylorax/api/recipes.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.recipes &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.recipes &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/server.html
+++ b/docs/html/_modules/pylorax/api/server.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.server &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.server &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/timestamp.html
+++ b/docs/html/_modules/pylorax/api/timestamp.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.timestamp &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.timestamp &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/toml.html
+++ b/docs/html/_modules/pylorax/api/toml.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.toml &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.toml &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/utils.html
+++ b/docs/html/_modules/pylorax/api/utils.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.utils &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.utils &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/v0.html
+++ b/docs/html/_modules/pylorax/api/v0.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.v0 &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.v0 &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/v1.html
+++ b/docs/html/_modules/pylorax/api/v1.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.v1 &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.v1 &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/api/workspace.html
+++ b/docs/html/_modules/pylorax/api/workspace.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api.workspace &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api.workspace &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/base.html
+++ b/docs/html/_modules/pylorax/base.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.base &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.base &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/buildstamp.html
+++ b/docs/html/_modules/pylorax/buildstamp.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.buildstamp &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.buildstamp &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/cmdline.html
+++ b/docs/html/_modules/pylorax/cmdline.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.cmdline &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.cmdline &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -270,6 +270,8 @@
                          <span class="n">help</span><span class="o">=</span><span class="s2">&quot;Enable a DNF plugin by name/glob, or * to enable all of them.&quot;</span><span class="p">)</span>
    <span class="n">optional</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s2">&quot;--squashfs-only&quot;</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s2">&quot;store_true&quot;</span><span class="p">,</span> <span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
                          <span class="n">help</span><span class="o">=</span><span class="s2">&quot;Use a plain squashfs filesystem for the runtime.&quot;</span><span class="p">)</span>
+    <span class="n">optional</span><span class="o">.</span><span class="n">add_argument</span><span class="p">(</span><span class="s2">&quot;--skip-branding&quot;</span><span class="p">,</span> <span class="n">action</span><span class="o">=</span><span class="s2">&quot;store_true&quot;</span><span class="p">,</span> <span class="n">default</span><span class="o">=</span><span class="kc">False</span><span class="p">,</span>
+                          <span class="n">help</span><span class="o">=</span><span class="s2">&quot;Disable automatic branding package selection. Use --installpkgs to add custom branding.&quot;</span><span class="p">)</span>

    <span class="c1"># dracut arguments</span>
    <span class="n">dracut_group</span> <span class="o">=</span> <span class="n">parser</span><span class="o">.</span><span class="n">add_argument_group</span><span class="p">(</span><span class="s2">&quot;dracut arguments: (default: </span><span class="si">%s</span><span class="s2">)&quot;</span> <span class="o">%</span> <span class="n">dracut_default</span><span class="p">)</span>
--- a/docs/html/_modules/pylorax/creator.html
+++ b/docs/html/_modules/pylorax/creator.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.creator &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.creator &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/decorators.html
+++ b/docs/html/_modules/pylorax/decorators.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.decorators &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.decorators &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/discinfo.html
+++ b/docs/html/_modules/pylorax/discinfo.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.discinfo &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.discinfo &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/dnfbase.html
+++ b/docs/html/_modules/pylorax/dnfbase.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.dnfbase &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.dnfbase &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/dnfhelper.html
+++ b/docs/html/_modules/pylorax/dnfhelper.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.dnfhelper &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.dnfhelper &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/executils.html
+++ b/docs/html/_modules/pylorax/executils.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.executils &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.executils &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/imgutils.html
+++ b/docs/html/_modules/pylorax/imgutils.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.imgutils &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.imgutils &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/installer.html
+++ b/docs/html/_modules/pylorax/installer.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.installer &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.installer &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/ltmpl.html
+++ b/docs/html/_modules/pylorax/ltmpl.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.ltmpl &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.ltmpl &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -406,35 +406,31 @@
    <span class="k">def</span> <span class="nf">_getsize</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="o">*</span><span class="n">files</span><span class="p">):</span>
        <span class="k">return</span> <span class="nb">sum</span><span class="p">(</span><span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">getsize</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="n">f</span><span class="p">))</span> <span class="k">for</span> <span class="n">f</span> <span class="ow">in</span> <span class="n">files</span> <span class="k">if</span> <span class="n">os</span><span class="o">.</span><span class="n">path</span><span class="o">.</span><span class="n">isfile</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="n">f</span><span class="p">)))</span>

-    <span class="k">def</span> <span class="nf">_write_debuginfo_log</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+    <span class="k">def</span> <span class="nf">_write_package_log</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
        <span class="sd">&quot;&quot;&quot;</span>
-<span class="sd">        Write a list of debuginfo packages to /root/debug-pkgs.log</span>
+<span class="sd">        Write the list of installed packages to /root/ on the boot.iso</span>

 <span class="sd">        If lorax is called with a debug repo find the corresponding debuginfo package</span>
 <span class="sd">        names and write them to /root/debubg-pkgs.log on the boot.iso</span>
+<span class="sd">        The non-debuginfo packages are written to /root/lorax-packages.log</span>
 <span class="sd">        &quot;&quot;&quot;</span>
-        <span class="k">for</span> <span class="n">repo</span> <span class="ow">in</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">repos</span><span class="p">:</span>
-            <span class="n">repo</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">repos</span><span class="p">[</span><span class="n">repo</span><span class="p">]</span>
-            <span class="k">if</span> <span class="nb">any</span><span class="p">(</span><span class="kc">True</span> <span class="k">for</span> <span class="n">url</span> <span class="ow">in</span> <span class="n">repo</span><span class="o">.</span><span class="n">baseurl</span> <span class="k">if</span> <span class="s2">&quot;debug&quot;</span> <span class="ow">in</span> <span class="n">url</span><span class="p">):</span>
-                <span class="k">break</span>
-            <span class="k">if</span> <span class="n">repo</span><span class="o">.</span><span class="n">metalink</span> <span class="ow">and</span> <span class="s2">&quot;debug&quot;</span> <span class="ow">in</span> <span class="n">repo</span><span class="o">.</span><span class="n">metalink</span><span class="p">:</span>
-                <span class="k">break</span>
-            <span class="k">if</span> <span class="n">repo</span><span class="o">.</span><span class="n">mirrorlist</span> <span class="ow">and</span> <span class="s2">&quot;debug&quot;</span> <span class="ow">in</span> <span class="n">repo</span><span class="o">.</span><span class="n">mirrorlist</span><span class="p">:</span>
-                <span class="k">break</span>
-        <span class="k">else</span><span class="p">:</span>
-            <span class="c1"># No debug repos</span>
-            <span class="k">return</span>
-
+        <span class="n">os</span><span class="o">.</span><span class="n">makedirs</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="s2">&quot;root/&quot;</span><span class="p">),</span> <span class="n">exist_ok</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
        <span class="n">available</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">sack</span><span class="o">.</span><span class="n">query</span><span class="p">()</span><span class="o">.</span><span class="n">available</span><span class="p">()</span>
+        <span class="n">pkgs</span> <span class="o">=</span> <span class="p">[]</span>
        <span class="n">debug_pkgs</span> <span class="o">=</span> <span class="p">[]</span>
        <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="nb">list</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">transaction</span><span class="o">.</span><span class="n">install_set</span><span class="p">):</span>
+            <span class="n">pkgs</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">f</span><span class="s2">&quot;</span><span class="si">{p.name}</span><span class="s2">-</span><span class="si">{p.version}</span><span class="s2">-</span><span class="si">{p.release}</span><span class="s2">.</span><span class="si">{p.arch}</span><span class="s2">&quot;</span><span class="p">)</span>
            <span class="k">if</span> <span class="n">available</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">name</span><span class="o">=</span><span class="n">p</span><span class="o">.</span><span class="n">name</span><span class="o">+</span><span class="s2">&quot;-debuginfo&quot;</span><span class="p">):</span>
-                <span class="n">debug_pkgs</span> <span class="o">+=</span> <span class="p">[</span><span class="s2">&quot;</span><span class="si">{0.name}</span><span class="s2">-debuginfo-</span><span class="si">{0.epoch}</span><span class="s2">:</span><span class="si">{0.version}</span><span class="s2">-</span><span class="si">{0.release}</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">format</span><span class="p">(</span><span class="n">p</span><span class="p">)]</span>
+                <span class="n">debug_pkgs</span><span class="o">.</span><span class="n">append</span><span class="p">(</span><span class="n">f</span><span class="s2">&quot;</span><span class="si">{p.name}</span><span class="s2">-debuginfo-</span><span class="si">{p.epoch}</span><span class="s2">:</span><span class="si">{p.version}</span><span class="s2">-</span><span class="si">{p.release}</span><span class="s2">&quot;</span><span class="p">)</span>

-        <span class="n">os</span><span class="o">.</span><span class="n">makedirs</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="s2">&quot;root/&quot;</span><span class="p">),</span> <span class="n">exist_ok</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
-        <span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="s2">&quot;root/debug-pkgs.log&quot;</span><span class="p">),</span> <span class="s2">&quot;w&quot;</span><span class="p">)</span> <span class="k">as</span> <span class="n">f</span><span class="p">:</span>
-            <span class="k">for</span> <span class="n">pkg</span> <span class="ow">in</span> <span class="n">debug_pkgs</span><span class="p">:</span>
-                <span class="n">f</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s2">&quot;</span><span class="si">%s</span><span class="se">\n</span><span class="s2">&quot;</span> <span class="o">%</span> <span class="n">pkg</span><span class="p">)</span>
+        <span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="s2">&quot;root/lorax-packages.log&quot;</span><span class="p">),</span> <span class="s2">&quot;w&quot;</span><span class="p">)</span> <span class="k">as</span> <span class="n">f</span><span class="p">:</span>
+            <span class="n">f</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="nb">sorted</span><span class="p">(</span><span class="n">pkgs</span><span class="p">)))</span>
+            <span class="n">f</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">)</span>
+
+        <span class="k">if</span> <span class="n">debug_pkgs</span><span class="p">:</span>
+            <span class="k">with</span> <span class="nb">open</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">_out</span><span class="p">(</span><span class="s2">&quot;root/debug-pkgs.log&quot;</span><span class="p">),</span> <span class="s2">&quot;w&quot;</span><span class="p">)</span> <span class="k">as</span> <span class="n">f</span><span class="p">:</span>
+                <span class="n">f</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="nb">sorted</span><span class="p">(</span><span class="n">debug_pkgs</span><span class="p">)))</span>
+                <span class="n">f</span><span class="o">.</span><span class="n">write</span><span class="p">(</span><span class="s2">&quot;</span><span class="se">\n</span><span class="s2">&quot;</span><span class="p">)</span>

 <div class="viewcode-block" id="LoraxTemplateRunner.install"><a class="viewcode-back" href="../../pylorax.html#pylorax.ltmpl.LoraxTemplateRunner.install">[docs]</a>    <span class="k">def</span> <span class="nf">install</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">srcglob</span><span class="p">,</span> <span class="n">dest</span><span class="p">):</span>
        <span class="sd">&#39;&#39;&#39;</span>
@ -799,8 +795,8 @@
        <span class="k">if</span> <span class="nb">len</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">transaction</span><span class="p">)</span> <span class="o">==</span> <span class="mi">0</span><span class="p">:</span>
            <span class="k">raise</span> <span class="ne">Exception</span><span class="p">(</span><span class="s2">&quot;No packages in transaction&quot;</span><span class="p">)</span>

-        <span class="c1"># If a debug repo has been included, write out a list of debuginfo packages</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">_write_debuginfo_log</span><span class="p">()</span>
+        <span class="c1"># Write out the packages installed, including debuginfo packages</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_write_package_log</span><span class="p">()</span>

        <span class="n">pkgs_to_download</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">transaction</span><span class="o">.</span><span class="n">install_set</span>
        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s2">&quot;Downloading packages&quot;</span><span class="p">)</span>
--- a/docs/html/_modules/pylorax/monitor.html
+++ b/docs/html/_modules/pylorax/monitor.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.monitor &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.monitor &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/mount.html
+++ b/docs/html/_modules/pylorax/mount.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.mount &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.mount &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/sysutils.html
+++ b/docs/html/_modules/pylorax/sysutils.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.sysutils &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.sysutils &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_modules/pylorax/treebuilder.html
+++ b/docs/html/_modules/pylorax/treebuilder.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.treebuilder &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.treebuilder &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -230,7 +230,8 @@
    <span class="k">def</span> <span class="nf">__init__</span><span class="p">(</span><span class="bp">self</span><span class="p">,</span> <span class="n">product</span><span class="p">,</span> <span class="n">arch</span><span class="p">,</span> <span class="n">dbo</span><span class="p">,</span> <span class="n">templatedir</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
                 <span class="n">installpkgs</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span> <span class="n">excludepkgs</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
                 <span class="n">add_templates</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
-                 <span class="n">add_template_vars</span><span class="o">=</span><span class="kc">None</span><span class="p">):</span>
+                 <span class="n">add_template_vars</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
+                 <span class="n">skip_branding</span><span class="o">=</span><span class="kc">False</span><span class="p">):</span>
        <span class="n">root</span> <span class="o">=</span> <span class="n">dbo</span><span class="o">.</span><span class="n">conf</span><span class="o">.</span><span class="n">installroot</span>
        <span class="c1"># use a copy of product so we can modify it locally</span>
        <span class="n">product</span> <span class="o">=</span> <span class="n">product</span><span class="o">.</span><span class="n">copy</span><span class="p">()</span>
@ -246,23 +247,36 @@
        <span class="bp">self</span><span class="o">.</span><span class="n">_excludepkgs</span> <span class="o">=</span> <span class="n">excludepkgs</span> <span class="ow">or</span> <span class="p">[]</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_runner</span><span class="o">.</span><span class="n">defaults</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">vars</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">reset</span><span class="p">()</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">_skip_branding</span> <span class="o">=</span> <span class="n">skip_branding</span>

    <span class="k">def</span> <span class="nf">_install_branding</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
+        <span class="sd">&quot;&quot;&quot;Select the branding from the available &#39;system-release&#39; packages</span>
+<span class="sd">        The *best* way to control this is to have a single package in the repo provide &#39;system-release&#39;</span>
+<span class="sd">        When there are more than 1 package it will:</span>
+<span class="sd">        - Make a list of the available packages</span>
+<span class="sd">        - If variant is set look for a package ending with lower(variant) and use that</span>
+<span class="sd">        - If there are one or more non-generic packages, use the first one after sorting</span>
+<span class="sd">        &quot;&quot;&quot;</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">_skip_branding</span><span class="p">:</span>
+            <span class="k">return</span>
+
        <span class="n">release</span> <span class="o">=</span> <span class="kc">None</span>
        <span class="n">q</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">dbo</span><span class="o">.</span><span class="n">sack</span><span class="o">.</span><span class="n">query</span><span class="p">()</span>
        <span class="n">a</span> <span class="o">=</span> <span class="n">q</span><span class="o">.</span><span class="n">available</span><span class="p">()</span>
-        <span class="k">for</span> <span class="n">pkg</span> <span class="ow">in</span> <span class="n">a</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">provides</span><span class="o">=</span><span class="s1">&#39;system-release&#39;</span><span class="p">):</span>
-            <span class="n">logger</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="s2">&quot;Found release package </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">pkg</span><span class="p">)</span>
-            <span class="k">if</span> <span class="n">pkg</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s1">&#39;generic&#39;</span><span class="p">):</span>
-                <span class="k">continue</span>
-            <span class="k">else</span><span class="p">:</span>
-                <span class="n">release</span> <span class="o">=</span> <span class="n">pkg</span><span class="o">.</span><span class="n">name</span>
-                <span class="k">break</span>
-
-        <span class="k">if</span> <span class="ow">not</span> <span class="n">release</span><span class="p">:</span>
-            <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s1">&#39;could not get the release&#39;</span><span class="p">)</span>
+        <span class="n">pkgs</span> <span class="o">=</span> <span class="nb">sorted</span><span class="p">([</span><span class="n">p</span><span class="o">.</span><span class="n">name</span> <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">a</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span><span class="n">provides</span><span class="o">=</span><span class="s1">&#39;system-release&#39;</span><span class="p">)</span>
+                                    <span class="k">if</span> <span class="ow">not</span> <span class="n">p</span><span class="o">.</span><span class="n">name</span><span class="o">.</span><span class="n">startswith</span><span class="p">(</span><span class="s2">&quot;generic&quot;</span><span class="p">)])</span>
+        <span class="k">if</span> <span class="ow">not</span> <span class="n">pkgs</span><span class="p">:</span>
+            <span class="n">logger</span><span class="o">.</span><span class="n">error</span><span class="p">(</span><span class="s2">&quot;No system-release packages found, could not get the release&quot;</span><span class="p">)</span>
            <span class="k">return</span>

+        <span class="n">logger</span><span class="o">.</span><span class="n">debug</span><span class="p">(</span><span class="s2">&quot;system-release packages: </span><span class="si">%s</span><span class="s2">&quot;</span><span class="p">,</span> <span class="n">pkgs</span><span class="p">)</span>
+        <span class="k">if</span> <span class="bp">self</span><span class="o">.</span><span class="n">vars</span><span class="o">.</span><span class="n">product</span><span class="o">.</span><span class="n">variant</span><span class="p">:</span>
+            <span class="n">variant</span> <span class="o">=</span> <span class="p">[</span><span class="n">p</span> <span class="k">for</span> <span class="n">p</span> <span class="ow">in</span> <span class="n">pkgs</span> <span class="k">if</span> <span class="n">p</span><span class="o">.</span><span class="n">endswith</span><span class="p">(</span><span class="s2">&quot;-&quot;</span><span class="o">+</span><span class="bp">self</span><span class="o">.</span><span class="n">vars</span><span class="o">.</span><span class="n">product</span><span class="o">.</span><span class="n">variant</span><span class="o">.</span><span class="n">lower</span><span class="p">())]</span>
+            <span class="k">if</span> <span class="n">variant</span><span class="p">:</span>
+                <span class="n">release</span> <span class="o">=</span> <span class="n">variant</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
+        <span class="k">if</span> <span class="ow">not</span> <span class="n">release</span><span class="p">:</span>
+            <span class="n">release</span> <span class="o">=</span> <span class="n">pkgs</span><span class="p">[</span><span class="mi">0</span><span class="p">]</span>
+
        <span class="c1"># release</span>
        <span class="n">logger</span><span class="o">.</span><span class="n">info</span><span class="p">(</span><span class="s1">&#39;got release: </span><span class="si">%s</span><span class="s1">&#39;</span><span class="p">,</span> <span class="n">release</span><span class="p">)</span>
        <span class="bp">self</span><span class="o">.</span><span class="n">_runner</span><span class="o">.</span><span class="n">installpkg</span><span class="p">(</span><span class="n">release</span><span class="p">)</span>
--- a/docs/html/_modules/pylorax/treeinfo.html
+++ b/docs/html/_modules/pylorax/treeinfo.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.treeinfo &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.treeinfo &mdash; Lorax 32.12 documentation</title>
  

  
@ -58,7 +58,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/_sources/lorax-composer.rst.txt
+++ b/docs/html/_sources/lorax-composer.rst.txt
@ -4,7 +4,7 @@ lorax-composer
 :Authors:
    Brian C. Lane <bcl@redhat.com>

-``lorax-composer`` is an API server that allows you to build disk images using
+``lorax-composer`` is a WELDR API server that allows you to build disk images using
 `Blueprints`_ to describe the package versions to be installed into the image.
 It is compatible with the Weldr project's bdcs-api REST protocol. More
 information on Weldr can be found `on the Weldr blog <http://www.weldr.io>`_.
@ -13,6 +13,15 @@ Behind the scenes it uses `livemedia-creator <livemedia-creator.html>`_ and
 `Anaconda <https://anaconda-installer.readthedocs.io/en/latest/>`_ to handle the
 installation and configuration of the images.

+.. note::
+
+    ``lorax-composer`` is now deprecated. It is being replaced by the
+    ``osbuild-composer`` WELDR API server which implements more features (eg.
+    ostree, image uploads, etc.) You can still use ``composer-cli`` and
+    ``cockpit-composer`` with ``osbuild-composer``. See the documentation or
+    the `osbuild website <https://www.osbuild.org/>`_ for more information.
+
+
 Important Things To Note
 ------------------------

--- a/docs/html/_sources/lorax.rst.txt
+++ b/docs/html/_sources/lorax.rst.txt
@ -54,6 +54,40 @@ Under ``./results/`` will be the release tree files: .discinfo, .treeinfo, every
 goes onto the boot.iso, the pxeboot directory, and the boot.iso under ``./images/``.


+Branding
+--------
+
+By default lorax will search for the first package that provides ``system-release``
+that doesn't start with ``generic-`` and will install it. It then selects a
+corresponding logo package by using the first part of the system-release package and
+appending ``-logos`` to it. eg. fedora-release and fedora-logos.
+
+Variants
+~~~~~~~~
+
+If a ``variant`` is passed to lorax it will select a ``system-release`` package that
+ends with the variant name. eg. Passing ``--variant workstation`` will select the
+``fedora-release-workstation`` package if it exists. It will select a logo package
+the same way it does for non-variants. eg. ``fedora-logos``.
+
+If there is no package ending with the variant name it will fall back to using the
+first non-generic package providing ``system-release``.
+
+Custom Branding
+~~~~~~~~~~~~~~~
+
+If ``--skip-branding`` is passed to lorax it will skip selecting the
+``system-release``, and logos packages and leave it up to the user to pass any
+branding related packages to lorax using ``--installpkgs``. When using
+``skip-branding`` you must make sure that you provide all of the expected files,
+otherwise Anaconda may not work as expected. See the contents of ``fedora-release``
+and ``fedora-logos`` for examples of what to include.
+
+Note that this does not prevent something else in the dependency tree from
+causing these packages to be included. Using ``--excludepkgs`` may help if they
+are unexpectedly included.
+
+
 Running inside of mock
 ----------------------

--- a/docs/html/_static/documentation_options.js
+++ b/docs/html/_static/documentation_options.js
@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '32.6',
+    VERSION: '32.12',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    FILE_SUFFIX: '.html',
--- a/docs/html/composer-cli.html
+++ b/docs/html/composer-cli.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer-cli &mdash; Lorax 32.6 documentation</title>
+  <title>composer-cli &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -231,7 +231,11 @@ group. They do not need to be root, but all of the <a class="reference external"
 </dl>
 </div>
 <p><dl class="simple">
-<dt>compose start &lt;BLUEPRINT&gt; &lt;TYPE&gt; [&lt;IMAGE-NAME&gt; &lt;PROVIDER&gt; &lt;PROFILE&gt; | &lt;IMAGE-NAME&gt; &lt;PROFILE.TOML&gt;]</dt><dd><p>Start a compose using the selected blueprint and output type. Optionally start an upload.</p>
+<dt>compose start [--size XXXX] &lt;BLUEPRINT&gt; &lt;TYPE&gt; [&lt;IMAGE-NAME&gt; &lt;PROVIDER&gt; &lt;PROFILE&gt; | &lt;IMAGE-NAME&gt; &lt;PROFILE.TOML&gt;]</dt><dd><p>Start a compose using the selected blueprint and output type. Optionally start an upload.
+--size is supported by osbuild-composer, and is in MiB.</p>
+</dd>
+<dt>compose start-ostree [--size XXXX] &lt;BLUEPRINT&gt; &lt;TYPE&gt; &lt;REF&gt; &lt;PARENT&gt; [&lt;IMAGE-NAME&gt; &lt;PROVIDER&gt; &lt;PROFILE&gt; | &lt;IMAGE-NAME&gt; &lt;PROFILE.TOML&gt;]</dt><dd><p>Start an ostree compose using the selected blueprint and output type. Optionally start an upload. This command
+is only supported by osbuild-composer, and requires the ostree REF and PARENT. --size is in MiB.</p>
 </dd>
 <dt>compose types</dt><dd><p>List the supported output types.</p>
 </dd>
--- a/docs/html/composer.cli.html
+++ b/docs/html/composer.cli.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer.cli package &mdash; Lorax 32.6 documentation</title>
+  <title>composer.cli package &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -525,7 +525,7 @@ blueprints freeze save &lt;blueprint,...&gt; Save the frozen blueprint to a file
 <span id="composer-cli-compose-module"></span><h2>composer.cli.compose module<a class="headerlink" href="#module-composer.cli.compose" title="Permalink to this headline">¶</a></h2>
 <dl class="function">
 <dt id="composer.cli.compose.compose_cancel">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_cancel</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_cancel"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_cancel" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_cancel</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_cancel"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_cancel" title="Permalink to this definition">¶</a></dt>
 <dd><p>Cancel a running compose</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -558,11 +558,15 @@ blueprints freeze save &lt;blueprint,...&gt; Save the frozen blueprint to a file
 </dd>
 </dl>
 <p>This dispatches the compose commands to a function</p>
+<p>compose_cmd expects api to be passed. eg.</p>
+<blockquote>
+<div><p>{&quot;version&quot;: 1, &quot;backend&quot;: &quot;lorax-composer&quot;}</p>
+</div></blockquote>
 </dd></dl>

 <dl class="function">
 <dt id="composer.cli.compose.compose_delete">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_delete</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_delete"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_delete" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_delete</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_delete"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_delete" title="Permalink to this definition">¶</a></dt>
 <dd><p>Delete a finished compose's results</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -582,7 +586,7 @@ or failed, not a running compose.</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_image">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_image</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_image"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_image" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_image</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_image"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_image" title="Permalink to this definition">¶</a></dt>
 <dd><p>Download the compose's output image</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -602,7 +606,7 @@ of compose that was selected.</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_info">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_info</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_info"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_info" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_info</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_info"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_info" title="Permalink to this definition">¶</a></dt>
 <dd><p>Return detailed information about the compose</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -621,13 +625,13 @@ of compose that was selected.</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_list">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_list</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_list"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_list" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_list</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_list"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_list" title="Permalink to this definition">¶</a></dt>
 <dd><p>Return a simple list of compose identifiers</p>
 </dd></dl>

 <dl class="function">
 <dt id="composer.cli.compose.compose_log">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_log</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_log"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_log" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_log</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_log"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_log" title="Permalink to this definition">¶</a></dt>
 <dd><p>Show the last part of the compose log</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -647,7 +651,7 @@ during the build.</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_logs">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_logs</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_logs"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_logs" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_logs</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_logs"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_logs" title="Permalink to this definition">¶</a></dt>
 <dd><p>Download a tar of the compose's logs</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -666,7 +670,7 @@ during the build.</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_metadata">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_metadata</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_metadata"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_metadata" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_metadata</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_metadata"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_metadata" title="Permalink to this definition">¶</a></dt>
 <dd><p>Download a tar file of the compose's metadata</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -683,9 +687,28 @@ during the build.</p>
 <p>Saves the metadata as uuid-metadata.tar</p>
 </dd></dl>

+<dl class="function">
+<dt id="composer.cli.compose.compose_ostree">
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_ostree</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_ostree"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_ostree" title="Permalink to this definition">¶</a></dt>
+<dd><p>Start a new compose using the selected blueprint and type</p>
+<dl class="field-list simple">
+<dt class="field-odd">Parameters</dt>
+<dd class="field-odd"><ul class="simple">
+<li><p><strong>socket_path</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#str" title="(in Python v3.8)"><em>str</em></a>) -- Path to the Unix socket to use for API communication</p></li>
+<li><p><strong>api_version</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#str" title="(in Python v3.8)"><em>str</em></a>) -- Version of the API to talk to. eg. &quot;0&quot;</p></li>
+<li><p><strong>args</strong> (<em>list of str</em>) -- List of remaining arguments from the cmdline</p></li>
+<li><p><strong>show_json</strong> (<a class="reference external" href="https://docs.python.org/3/library/functions.html#bool" title="(in Python v3.8)"><em>bool</em></a>) -- Set to True to show the JSON output instead of the human readable output</p></li>
+<li><p><strong>testmode</strong> (<a class="reference external" href="https://docs.python.org/3/library/functions.html#int" title="(in Python v3.8)"><em>int</em></a>) -- Set to 1 to simulate a failed compose, set to 2 to simulate a finished one.</p></li>
+<li><p><strong>api</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#dict" title="(in Python v3.8)"><em>dict</em></a>) -- Details about the API server, &quot;version&quot; and &quot;backend&quot;</p></li>
+</ul>
+</dd>
+</dl>
+<p>compose start [--size XXX] &lt;blueprint-name&gt; &lt;compose-type&gt; &lt;ostree-ref&gt; &lt;ostree-parent&gt; [&lt;image-name&gt; &lt;provider&gt; &lt;profile&gt; | &lt;image-name&gt; &lt;profile.toml&gt;]</p>
+</dd></dl>
+
 <dl class="function">
 <dt id="composer.cli.compose.compose_results">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_results</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_results"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_results" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_results</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_results"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_results" title="Permalink to this definition">¶</a></dt>
 <dd><p>Download a tar file of the compose's results</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -705,7 +728,7 @@ It is saved as uuid.tar</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_start">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_start</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_start"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_start" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_start</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_start"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_start" title="Permalink to this definition">¶</a></dt>
 <dd><p>Start a new compose using the selected blueprint and type</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -715,15 +738,16 @@ It is saved as uuid.tar</p>
 <li><p><strong>args</strong> (<em>list of str</em>) -- List of remaining arguments from the cmdline</p></li>
 <li><p><strong>show_json</strong> (<a class="reference external" href="https://docs.python.org/3/library/functions.html#bool" title="(in Python v3.8)"><em>bool</em></a>) -- Set to True to show the JSON output instead of the human readable output</p></li>
 <li><p><strong>testmode</strong> (<a class="reference external" href="https://docs.python.org/3/library/functions.html#int" title="(in Python v3.8)"><em>int</em></a>) -- Set to 1 to simulate a failed compose, set to 2 to simulate a finished one.</p></li>
+<li><p><strong>api</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#dict" title="(in Python v3.8)"><em>dict</em></a>) -- Details about the API server, &quot;version&quot; and &quot;backend&quot;</p></li>
 </ul>
 </dd>
 </dl>
-<p>compose start &lt;blueprint-name&gt; &lt;compose-type&gt; [&lt;image-name&gt; &lt;provider&gt; &lt;profile&gt; | &lt;image-name&gt; &lt;profile.toml&gt;]</p>
+<p>compose start [--size XXX] &lt;blueprint-name&gt; &lt;compose-type&gt; [&lt;image-name&gt; &lt;provider&gt; &lt;profile&gt; | &lt;image-name&gt; &lt;profile.toml&gt;]</p>
 </dd></dl>

 <dl class="function">
 <dt id="composer.cli.compose.compose_status">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_status</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_status"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_status" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_status</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_status"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_status" title="Permalink to this definition">¶</a></dt>
 <dd><p>Return the status of all known composes</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -742,7 +766,7 @@ and failed so raw JSON output is not available.</p>

 <dl class="function">
 <dt id="composer.cli.compose.compose_types">
-<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_types</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_types"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_types" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">compose_types</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">api_version</em>, <em class="sig-param">args</em>, <em class="sig-param">show_json=False</em>, <em class="sig-param">testmode=0</em>, <em class="sig-param">api=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#compose_types"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.compose_types" title="Permalink to this definition">¶</a></dt>
 <dd><p>Return information about the supported compose types</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -759,6 +783,30 @@ and failed so raw JSON output is not available.</p>
 include this extra information.</p>
 </dd></dl>

+<dl class="function">
+<dt id="composer.cli.compose.get_size">
+<code class="sig-prename descclassname">composer.cli.compose.</code><code class="sig-name descname">get_size</code><span class="sig-paren">(</span><em class="sig-param">args</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/cli/compose.html#get_size"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.cli.compose.get_size" title="Permalink to this definition">¶</a></dt>
+<dd><p>Return optional size argument, and remaining args</p>
+<dl class="field-list simple">
+<dt class="field-odd">Parameters</dt>
+<dd class="field-odd"><p><strong>api</strong> (<a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#dict" title="(in Python v3.8)"><em>dict</em></a>) -- Details about the API server, &quot;version&quot; and &quot;backend&quot;</p>
+</dd>
+<dt class="field-even">Returns</dt>
+<dd class="field-even"><p>(args, size)</p>
+</dd>
+<dt class="field-odd">Return type</dt>
+<dd class="field-odd"><p><a class="reference external" href="https://docs.python.org/3/library/stdtypes.html#tuple" title="(in Python v3.8)">tuple</a></p>
+</dd>
+</dl>
+<ul class="simple">
+<li><p>check size argument for int</p></li>
+<li><p>check other args for --size in wrong place</p></li>
+<li><p>raise error? Or just return 0?</p></li>
+<li><p>no size returns 0 in size</p></li>
+<li><p>multiply by 1024**2 to make it easier on users to specify large sizes</p></li>
+</ul>
+</dd></dl>
+
 </div>
 <div class="section" id="module-composer.cli.help">
 <span id="composer-cli-help-module"></span><h2>composer.cli.help module<a class="headerlink" href="#module-composer.cli.help" title="Permalink to this headline">¶</a></h2>
--- a/docs/html/composer.html
+++ b/docs/html/composer.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>composer package &mdash; Lorax 32.6 documentation</title>
+  <title>composer package &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -250,7 +250,7 @@ query string.</p>

 <dl class="function">
 <dt id="composer.http_client.delete_url_json">
-<code class="sig-prename descclassname">composer.http_client.</code><code class="sig-name descname">delete_url_json</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">url</em>, <em class="sig-param">timeout=120</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/http_client.html#delete_url_json"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.http_client.delete_url_json" title="Permalink to this definition">¶</a></dt>
+<code class="sig-prename descclassname">composer.http_client.</code><code class="sig-name descname">delete_url_json</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">url</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/http_client.html#delete_url_json"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.http_client.delete_url_json" title="Permalink to this definition">¶</a></dt>
 <dd><p>Send a DELETE request to the url and return JSON response</p>
 <dl class="field-list simple">
 <dt class="field-odd">Parameters</dt>
@ -432,7 +432,7 @@ fetch all results for the given request.</p>
 <span id="composer-unix-socket-module"></span><h2>composer.unix_socket module<a class="headerlink" href="#module-composer.unix_socket" title="Permalink to this headline">¶</a></h2>
 <dl class="class">
 <dt id="composer.unix_socket.UnixHTTPConnection">
-<em class="property">class </em><code class="sig-prename descclassname">composer.unix_socket.</code><code class="sig-name descname">UnixHTTPConnection</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">timeout=60</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/unix_socket.html#UnixHTTPConnection"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.unix_socket.UnixHTTPConnection" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><code class="sig-prename descclassname">composer.unix_socket.</code><code class="sig-name descname">UnixHTTPConnection</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">timeout=300</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/unix_socket.html#UnixHTTPConnection"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.unix_socket.UnixHTTPConnection" title="Permalink to this definition">¶</a></dt>
 <dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/http.client.html#http.client.HTTPConnection" title="(in Python v3.8)"><code class="xref py py-class docutils literal notranslate"><span class="pre">http.client.HTTPConnection</span></code></a>, <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.8)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <dl class="method">
 <dt id="composer.unix_socket.UnixHTTPConnection.connect">
@ -444,7 +444,7 @@ fetch all results for the given request.</p>

 <dl class="class">
 <dt id="composer.unix_socket.UnixHTTPConnectionPool">
-<em class="property">class </em><code class="sig-prename descclassname">composer.unix_socket.</code><code class="sig-name descname">UnixHTTPConnectionPool</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">timeout=60</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/unix_socket.html#UnixHTTPConnectionPool"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.unix_socket.UnixHTTPConnectionPool" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><code class="sig-prename descclassname">composer.unix_socket.</code><code class="sig-name descname">UnixHTTPConnectionPool</code><span class="sig-paren">(</span><em class="sig-param">socket_path</em>, <em class="sig-param">timeout=300</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/composer/unix_socket.html#UnixHTTPConnectionPool"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#composer.unix_socket.UnixHTTPConnectionPool" title="Permalink to this definition">¶</a></dt>
 <dd><p>Bases: <code class="xref py py-class docutils literal notranslate"><span class="pre">urllib3.connectionpool.HTTPConnectionPool</span></code></p>
 </dd></dl>

--- a/docs/html/genindex.html
+++ b/docs/html/genindex.html
@ -9,7 +9,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Index &mdash; Lorax 32.6 documentation</title>
+  <title>Index &mdash; Lorax 32.12 documentation</title>
  

  
@ -59,7 +59,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -346,6 +346,8 @@
      <li><a href="composer.cli.html#composer.cli.compose.compose_logs">compose_logs() (in module composer.cli.compose)</a>
 </li>
      <li><a href="composer.cli.html#composer.cli.compose.compose_metadata">compose_metadata() (in module composer.cli.compose)</a>
+</li>
+      <li><a href="composer.cli.html#composer.cli.compose.compose_ostree">compose_ostree() (in module composer.cli.compose)</a>
 </li>
      <li><a href="composer.cli.html#composer.cli.compose.compose_results">compose_results() (in module composer.cli.compose)</a>
 </li>
@ -353,14 +355,14 @@
 </li>
      <li><a href="composer.cli.html#composer.cli.compose.compose_status">compose_status() (in module composer.cli.compose)</a>
 </li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
      <li><a href="composer.cli.html#composer.cli.compose.compose_types">compose_types() (in module composer.cli.compose)</a>

      <ul>
        <li><a href="pylorax.api.html#pylorax.api.compose.compose_types">(in module pylorax.api.compose)</a>
 </li>
      </ul></li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
      <li><a href="composer.html#module-composer">composer (module)</a>
 </li>
      <li><a href="composer.cli.html#module-composer.cli">composer.cli (module)</a>
@ -601,10 +603,10 @@
 </li>
      <li><a href="pylorax.api.html#pylorax.api.compose.get_kernel_append">get_kernel_append() (in module pylorax.api.compose)</a>
 </li>
-  </ul></td>
-  <td style="width: 33%; vertical-align: top;"><ul>
      <li><a href="pylorax.api.html#pylorax.api.compose.get_keyboard_layout">get_keyboard_layout() (in module pylorax.api.compose)</a>
 </li>
+  </ul></td>
+  <td style="width: 33%; vertical-align: top;"><ul>
      <li><a href="pylorax.api.html#pylorax.api.compose.get_languages">get_languages() (in module pylorax.api.compose)</a>
 </li>
      <li><a href="pylorax.html#pylorax.imgutils.get_loop_name">get_loop_name() (in module pylorax.imgutils)</a>
@ -616,6 +618,8 @@
      <li><a href="pylorax.api.html#pylorax.api.recipes.get_revision_from_tag">get_revision_from_tag() (in module pylorax.api.recipes)</a>
 </li>
      <li><a href="pylorax.api.html#pylorax.api.compose.get_services">get_services() (in module pylorax.api.compose)</a>
+</li>
+      <li><a href="composer.cli.html#composer.cli.compose.get_size">get_size() (in module composer.cli.compose)</a>
 </li>
      <li><a href="pylorax.api.html#pylorax.api.projects.get_source_ids">get_source_ids() (in module pylorax.api.projects)</a>
 </li>
--- a/docs/html/index.html
+++ b/docs/html/index.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Welcome to Lorax&#39;s documentation! &mdash; Lorax 32.6 documentation</title>
+  <title>Welcome to Lorax&#39;s documentation! &mdash; Lorax 32.12 documentation</title>
  

  
@ -59,7 +59,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/intro.html
+++ b/docs/html/intro.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Introduction to Lorax &mdash; Lorax 32.6 documentation</title>
+  <title>Introduction to Lorax &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/lifted.html
+++ b/docs/html/lifted.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>lifted package &mdash; Lorax 32.6 documentation</title>
+  <title>lifted package &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/livemedia-creator.html
+++ b/docs/html/livemedia-creator.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>livemedia-creator &mdash; Lorax 32.6 documentation</title>
+  <title>livemedia-creator &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/lorax-composer.html
+++ b/docs/html/lorax-composer.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>lorax-composer &mdash; Lorax 32.6 documentation</title>
+  <title>lorax-composer &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -204,13 +204,21 @@
 <dd class="field-odd"><p>Brian C. Lane &lt;<a class="reference external" href="mailto:bcl&#37;&#52;&#48;redhat&#46;com">bcl<span>&#64;</span>redhat<span>&#46;</span>com</a>&gt;</p>
 </dd>
 </dl>
-<p><code class="docutils literal notranslate"><span class="pre">lorax-composer</span></code> is an API server that allows you to build disk images using
+<p><code class="docutils literal notranslate"><span class="pre">lorax-composer</span></code> is a WELDR API server that allows you to build disk images using
 <a class="reference internal" href="#blueprints">Blueprints</a> to describe the package versions to be installed into the image.
 It is compatible with the Weldr project's bdcs-api REST protocol. More
 information on Weldr can be found <a class="reference external" href="http://www.weldr.io">on the Weldr blog</a>.</p>
 <p>Behind the scenes it uses <a class="reference external" href="livemedia-creator.html">livemedia-creator</a> and
 <a class="reference external" href="https://anaconda-installer.readthedocs.io/en/latest/">Anaconda</a> to handle the
 installation and configuration of the images.</p>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p><code class="docutils literal notranslate"><span class="pre">lorax-composer</span></code> is now deprecated. It is being replaced by the
+<code class="docutils literal notranslate"><span class="pre">osbuild-composer</span></code> WELDR API server which implements more features (eg.
+ostree, image uploads, etc.) You can still use <code class="docutils literal notranslate"><span class="pre">composer-cli</span></code> and
+<code class="docutils literal notranslate"><span class="pre">cockpit-composer</span></code> with <code class="docutils literal notranslate"><span class="pre">osbuild-composer</span></code>. See the documentation or
+the <a class="reference external" href="https://www.osbuild.org/">osbuild website</a> for more information.</p>
+</div>
 <div class="section" id="important-things-to-note">
 <h2>Important Things To Note<a class="headerlink" href="#important-things-to-note" title="Permalink to this headline">¶</a></h2>
 <ul class="simple">
--- a/docs/html/lorax.html
+++ b/docs/html/lorax.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Lorax &mdash; Lorax 32.6 documentation</title>
+  <title>Lorax &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -97,6 +97,11 @@
 </ul>
 </li>
 <li class="toctree-l2"><a class="reference internal" href="#quickstart">Quickstart</a></li>
+<li class="toctree-l2"><a class="reference internal" href="#branding">Branding</a><ul>
+<li class="toctree-l3"><a class="reference internal" href="#variants">Variants</a></li>
+<li class="toctree-l3"><a class="reference internal" href="#custom-branding">Custom Branding</a></li>
+</ul>
+</li>
 <li class="toctree-l2"><a class="reference internal" href="#running-inside-of-mock">Running inside of mock</a></li>
 <li class="toctree-l2"><a class="reference internal" href="#how-it-works">How it works</a><ul>
 <li class="toctree-l3"><a class="reference internal" href="#runtime-install-tmpl">runtime-install.tmpl</a></li>
@ -206,7 +211,8 @@ repositories.</p>
             <span class="p">[</span><span class="o">--</span><span class="n">add</span><span class="o">-</span><span class="n">template</span><span class="o">-</span><span class="n">var</span> <span class="n">ADD_TEMPLATE_VARS</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">add</span><span class="o">-</span><span class="n">arch</span><span class="o">-</span><span class="n">template</span> <span class="n">ADD_ARCH_TEMPLATES</span><span class="p">]</span>
             <span class="p">[</span><span class="o">--</span><span class="n">add</span><span class="o">-</span><span class="n">arch</span><span class="o">-</span><span class="n">template</span><span class="o">-</span><span class="n">var</span> <span class="n">ADD_ARCH_TEMPLATE_VARS</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">noverify</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">sharedir</span> <span class="n">SHAREDIR</span><span class="p">]</span>
             <span class="p">[</span><span class="o">--</span><span class="n">enablerepo</span> <span class="p">[</span><span class="n">repo</span><span class="p">]]</span> <span class="p">[</span><span class="o">--</span><span class="n">disablerepo</span> <span class="p">[</span><span class="n">repo</span><span class="p">]]</span> <span class="p">[</span><span class="o">--</span><span class="n">rootfs</span><span class="o">-</span><span class="n">size</span> <span class="n">ROOTFS_SIZE</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">noverifyssl</span><span class="p">]</span>
-             <span class="p">[</span><span class="o">--</span><span class="n">dnfplugin</span> <span class="n">DNFPLUGINS</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">squashfs</span><span class="o">-</span><span class="n">only</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">dracut</span><span class="o">-</span><span class="n">conf</span> <span class="n">DRACUT_CONF</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">dracut</span><span class="o">-</span><span class="n">arg</span> <span class="n">DRACUT_ARGS</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">V</span><span class="p">]</span>
+             <span class="p">[</span><span class="o">--</span><span class="n">dnfplugin</span> <span class="n">DNFPLUGINS</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">squashfs</span><span class="o">-</span><span class="n">only</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">skip</span><span class="o">-</span><span class="n">branding</span><span class="p">]</span> <span class="p">[</span><span class="o">--</span><span class="n">dracut</span><span class="o">-</span><span class="n">conf</span> <span class="n">DRACUT_CONF</span><span class="p">]</span>
+             <span class="p">[</span><span class="o">--</span><span class="n">dracut</span><span class="o">-</span><span class="n">arg</span> <span class="n">DRACUT_ARGS</span><span class="p">]</span> <span class="p">[</span><span class="o">-</span><span class="n">V</span><span class="p">]</span>
             <span class="n">OUTPUTDIR</span>
 </pre></div>
 </div>
@ -363,6 +369,10 @@ repositories.</p>
 <dd><p>Use a plain squashfs filesystem for the runtime.</p>
 <p>Default: False</p>
 </dd>
+<dt><kbd>--skip-branding</kbd></dt>
+<dd><p>Disable automatic branding package selection. Use --installpkgs to add custom branding.</p>
+<p>Default: False</p>
+</dd>
 </dl>
 </div>
 <div class="section" id="dracut arguments: (default: )">
@ -394,6 +404,34 @@ override the ones in the distribution repositories.</p>
 <p>Under <code class="docutils literal notranslate"><span class="pre">./results/</span></code> will be the release tree files: .discinfo, .treeinfo, everything that
 goes onto the boot.iso, the pxeboot directory, and the boot.iso under <code class="docutils literal notranslate"><span class="pre">./images/</span></code>.</p>
 </div>
+<div class="section" id="branding">
+<h2>Branding<a class="headerlink" href="#branding" title="Permalink to this headline">¶</a></h2>
+<p>By default lorax will search for the first package that provides <code class="docutils literal notranslate"><span class="pre">system-release</span></code>
+that doesn't start with <code class="docutils literal notranslate"><span class="pre">generic-</span></code> and will install it. It then selects a
+corresponding logo package by using the first part of the system-release package and
+appending <code class="docutils literal notranslate"><span class="pre">-logos</span></code> to it. eg. fedora-release and fedora-logos.</p>
+<div class="section" id="variants">
+<h3>Variants<a class="headerlink" href="#variants" title="Permalink to this headline">¶</a></h3>
+<p>If a <code class="docutils literal notranslate"><span class="pre">variant</span></code> is passed to lorax it will select a <code class="docutils literal notranslate"><span class="pre">system-release</span></code> package that
+ends with the variant name. eg. Passing <code class="docutils literal notranslate"><span class="pre">--variant</span> <span class="pre">workstation</span></code> will select the
+<code class="docutils literal notranslate"><span class="pre">fedora-release-workstation</span></code> package if it exists. It will select a logo package
+the same way it does for non-variants. eg. <code class="docutils literal notranslate"><span class="pre">fedora-logos</span></code>.</p>
+<p>If there is no package ending with the variant name it will fall back to using the
+first non-generic package providing <code class="docutils literal notranslate"><span class="pre">system-release</span></code>.</p>
+</div>
+<div class="section" id="custom-branding">
+<h3>Custom Branding<a class="headerlink" href="#custom-branding" title="Permalink to this headline">¶</a></h3>
+<p>If <code class="docutils literal notranslate"><span class="pre">--skip-branding</span></code> is passed to lorax it will skip selecting the
+<code class="docutils literal notranslate"><span class="pre">system-release</span></code>, and logos packages and leave it up to the user to pass any
+branding related packages to lorax using <code class="docutils literal notranslate"><span class="pre">--installpkgs</span></code>. When using
+<code class="docutils literal notranslate"><span class="pre">skip-branding</span></code> you must make sure that you provide all of the expected files,
+otherwise Anaconda may not work as expected. See the contents of <code class="docutils literal notranslate"><span class="pre">fedora-release</span></code>
+and <code class="docutils literal notranslate"><span class="pre">fedora-logos</span></code> for examples of what to include.</p>
+<p>Note that this does not prevent something else in the dependency tree from
+causing these packages to be included. Using <code class="docutils literal notranslate"><span class="pre">--excludepkgs</span></code> may help if they
+are unexpectedly included.</p>
+</div>
+</div>
 <div class="section" id="running-inside-of-mock">
 <h2>Running inside of mock<a class="headerlink" href="#running-inside-of-mock" title="Permalink to this headline">¶</a></h2>
 <p>As of mock version 2.0 you no longer need to pass <code class="docutils literal notranslate"><span class="pre">--old-chroot</span></code>. You will,
--- a/docs/html/mkksiso.html
+++ b/docs/html/mkksiso.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>mkksiso &mdash; Lorax 32.6 documentation</title>
+  <title>mkksiso &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/modules.html
+++ b/docs/html/modules.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>src &mdash; Lorax 32.6 documentation</title>
+  <title>src &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/objects.inv
+++ b/docs/html/objects.inv
--- a/docs/html/product-images.html
+++ b/docs/html/product-images.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Product and Updates Images &mdash; Lorax 32.6 documentation</title>
+  <title>Product and Updates Images &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/py-modindex.html
+++ b/docs/html/py-modindex.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Python Module Index &mdash; Lorax 32.6 documentation</title>
+  <title>Python Module Index &mdash; Lorax 32.12 documentation</title>
  

  
@ -61,7 +61,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/pylorax.api.html
+++ b/docs/html/pylorax.api.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax.api package &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax.api package &mdash; Lorax 32.12 documentation</title>
  

  
@ -59,7 +59,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/pylorax.html
+++ b/docs/html/pylorax.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>pylorax package &mdash; Lorax 32.6 documentation</title>
+  <title>pylorax package &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
@ -1922,7 +1922,7 @@ iso's label.</p>
 <span id="pylorax-treebuilder-module"></span><h2>pylorax.treebuilder module<a class="headerlink" href="#module-pylorax.treebuilder" title="Permalink to this headline">¶</a></h2>
 <dl class="class">
 <dt id="pylorax.treebuilder.RuntimeBuilder">
-<em class="property">class </em><code class="sig-prename descclassname">pylorax.treebuilder.</code><code class="sig-name descname">RuntimeBuilder</code><span class="sig-paren">(</span><em class="sig-param">product</em>, <em class="sig-param">arch</em>, <em class="sig-param">dbo</em>, <em class="sig-param">templatedir=None</em>, <em class="sig-param">installpkgs=None</em>, <em class="sig-param">excludepkgs=None</em>, <em class="sig-param">add_templates=None</em>, <em class="sig-param">add_template_vars=None</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pylorax/treebuilder.html#RuntimeBuilder"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pylorax.treebuilder.RuntimeBuilder" title="Permalink to this definition">¶</a></dt>
+<em class="property">class </em><code class="sig-prename descclassname">pylorax.treebuilder.</code><code class="sig-name descname">RuntimeBuilder</code><span class="sig-paren">(</span><em class="sig-param">product</em>, <em class="sig-param">arch</em>, <em class="sig-param">dbo</em>, <em class="sig-param">templatedir=None</em>, <em class="sig-param">installpkgs=None</em>, <em class="sig-param">excludepkgs=None</em>, <em class="sig-param">add_templates=None</em>, <em class="sig-param">add_template_vars=None</em>, <em class="sig-param">skip_branding=False</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pylorax/treebuilder.html#RuntimeBuilder"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pylorax.treebuilder.RuntimeBuilder" title="Permalink to this definition">¶</a></dt>
 <dd><p>Bases: <a class="reference external" href="https://docs.python.org/3/library/functions.html#object" title="(in Python v3.8)"><code class="xref py py-class docutils literal notranslate"><span class="pre">object</span></code></a></p>
 <p>Builds the anaconda runtime image.</p>
 <dl class="method">
@ -2127,7 +2127,7 @@ name of the kernel.</p>

 <dl class="method">
 <dt id="pylorax.Lorax.run">
-<code class="sig-name descname">run</code><span class="sig-paren">(</span><em class="sig-param">dbo</em>, <em class="sig-param">product</em>, <em class="sig-param">version</em>, <em class="sig-param">release</em>, <em class="sig-param">variant=''</em>, <em class="sig-param">bugurl=''</em>, <em class="sig-param">isfinal=False</em>, <em class="sig-param">workdir=None</em>, <em class="sig-param">outputdir=None</em>, <em class="sig-param">buildarch=None</em>, <em class="sig-param">volid=None</em>, <em class="sig-param">domacboot=True</em>, <em class="sig-param">doupgrade=True</em>, <em class="sig-param">remove_temp=False</em>, <em class="sig-param">installpkgs=None</em>, <em class="sig-param">excludepkgs=None</em>, <em class="sig-param">size=2</em>, <em class="sig-param">add_templates=None</em>, <em class="sig-param">add_template_vars=None</em>, <em class="sig-param">add_arch_templates=None</em>, <em class="sig-param">add_arch_template_vars=None</em>, <em class="sig-param">verify=True</em>, <em class="sig-param">user_dracut_args=None</em>, <em class="sig-param">squashfs_only=False</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pylorax.html#Lorax.run"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pylorax.Lorax.run" title="Permalink to this definition">¶</a></dt>
+<code class="sig-name descname">run</code><span class="sig-paren">(</span><em class="sig-param">dbo</em>, <em class="sig-param">product</em>, <em class="sig-param">version</em>, <em class="sig-param">release</em>, <em class="sig-param">variant=''</em>, <em class="sig-param">bugurl=''</em>, <em class="sig-param">isfinal=False</em>, <em class="sig-param">workdir=None</em>, <em class="sig-param">outputdir=None</em>, <em class="sig-param">buildarch=None</em>, <em class="sig-param">volid=None</em>, <em class="sig-param">domacboot=True</em>, <em class="sig-param">doupgrade=True</em>, <em class="sig-param">remove_temp=False</em>, <em class="sig-param">installpkgs=None</em>, <em class="sig-param">excludepkgs=None</em>, <em class="sig-param">size=2</em>, <em class="sig-param">add_templates=None</em>, <em class="sig-param">add_template_vars=None</em>, <em class="sig-param">add_arch_templates=None</em>, <em class="sig-param">add_arch_template_vars=None</em>, <em class="sig-param">verify=True</em>, <em class="sig-param">user_dracut_args=None</em>, <em class="sig-param">squashfs_only=False</em>, <em class="sig-param">skip_branding=False</em><span class="sig-paren">)</span><a class="reference internal" href="_modules/pylorax.html#Lorax.run"><span class="viewcode-link">[source]</span></a><a class="headerlink" href="#pylorax.Lorax.run" title="Permalink to this definition">¶</a></dt>
 <dd></dd></dl>

 <dl class="method">
--- a/docs/html/search.html
+++ b/docs/html/search.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Search &mdash; Lorax 32.6 documentation</title>
+  <title>Search &mdash; Lorax 32.12 documentation</title>
  

  
@ -60,7 +60,7 @@
            
            
              <div class="version">
-                32.6
+                32.12
              </div>
            
          
--- a/docs/html/searchindex.js
+++ b/docs/html/searchindex.js
--- a/docs/lorax-composer.rst
+++ b/docs/lorax-composer.rst
@ -4,7 +4,7 @@ lorax-composer
 :Authors:
    Brian C. Lane <bcl@redhat.com>

-``lorax-composer`` is an API server that allows you to build disk images using
+``lorax-composer`` is a WELDR API server that allows you to build disk images using
 `Blueprints`_ to describe the package versions to be installed into the image.
 It is compatible with the Weldr project's bdcs-api REST protocol. More
 information on Weldr can be found `on the Weldr blog <http://www.weldr.io>`_.
@ -13,6 +13,15 @@ Behind the scenes it uses `livemedia-creator <livemedia-creator.html>`_ and
 `Anaconda <https://anaconda-installer.readthedocs.io/en/latest/>`_ to handle the
 installation and configuration of the images.

+.. note::
+
+    ``lorax-composer`` is now deprecated. It is being replaced by the
+    ``osbuild-composer`` WELDR API server which implements more features (eg.
+    ostree, image uploads, etc.) You can still use ``composer-cli`` and
+    ``cockpit-composer`` with ``osbuild-composer``. See the documentation or
+    the `osbuild website <https://www.osbuild.org/>`_ for more information.
+
+
 Important Things To Note
 ------------------------

--- a/docs/lorax.rst
+++ b/docs/lorax.rst
@ -54,6 +54,40 @@ Under ``./results/`` will be the release tree files: .discinfo, .treeinfo, every
 goes onto the boot.iso, the pxeboot directory, and the boot.iso under ``./images/``.


+Branding
+--------
+
+By default lorax will search for the first package that provides ``system-release``
+that doesn't start with ``generic-`` and will install it. It then selects a
+corresponding logo package by using the first part of the system-release package and
+appending ``-logos`` to it. eg. fedora-release and fedora-logos.
+
+Variants
+~~~~~~~~
+
+If a ``variant`` is passed to lorax it will select a ``system-release`` package that
+ends with the variant name. eg. Passing ``--variant workstation`` will select the
+``fedora-release-workstation`` package if it exists. It will select a logo package
+the same way it does for non-variants. eg. ``fedora-logos``.
+
+If there is no package ending with the variant name it will fall back to using the
+first non-generic package providing ``system-release``.
+
+Custom Branding
+~~~~~~~~~~~~~~~
+
+If ``--skip-branding`` is passed to lorax it will skip selecting the
+``system-release``, and logos packages and leave it up to the user to pass any
+branding related packages to lorax using ``--installpkgs``. When using
+``skip-branding`` you must make sure that you provide all of the expected files,
+otherwise Anaconda may not work as expected. See the contents of ``fedora-release``
+and ``fedora-logos`` for examples of what to include.
+
+Note that this does not prevent something else in the dependency tree from
+causing these packages to be included. Using ``--excludepkgs`` may help if they
+are unexpectedly included.
+
+
 Running inside of mock
 ----------------------

--- a/docs/man/.doctrees/composer-cli.doctree
+++ b/docs/man/.doctrees/composer-cli.doctree
--- a/docs/man/.doctrees/composer.cli.doctree
+++ b/docs/man/.doctrees/composer.cli.doctree
--- a/docs/man/.doctrees/composer.doctree
+++ b/docs/man/.doctrees/composer.doctree
--- a/docs/man/.doctrees/environment.pickle
+++ b/docs/man/.doctrees/environment.pickle
--- a/docs/man/.doctrees/lorax-composer.doctree
+++ b/docs/man/.doctrees/lorax-composer.doctree
--- a/docs/man/.doctrees/lorax.doctree
+++ b/docs/man/.doctrees/lorax.doctree
--- a/docs/man/.doctrees/pylorax.doctree
+++ b/docs/man/.doctrees/pylorax.doctree
--- a/docs/man/composer-cli.1
+++ b/docs/man/composer-cli.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "COMPOSER-CLI" "1" "Feb 12, 2020" "32.6" "Lorax"
+.TH "COMPOSER-CLI" "1" "Oct 01, 2020" "32.12" "Lorax"
 .SH NAME
 composer-cli \- Composer Cmdline Utility Documentation
 .
@ -94,8 +94,13 @@ Default: False
 .sp
 .INDENT 0.0
 .TP
-.B compose start <BLUEPRINT> <TYPE> [<IMAGE\-NAME> <PROVIDER> <PROFILE> | <IMAGE\-NAME> <PROFILE.TOML>]
+.B compose start [\-\-size XXXX] <BLUEPRINT> <TYPE> [<IMAGE\-NAME> <PROVIDER> <PROFILE> | <IMAGE\-NAME> <PROFILE.TOML>]
 Start a compose using the selected blueprint and output type. Optionally start an upload.
+\-\-size is supported by osbuild\-composer, and is in MiB.
+.TP
+.B compose start\-ostree [\-\-size XXXX] <BLUEPRINT> <TYPE> <REF> <PARENT> [<IMAGE\-NAME> <PROVIDER> <PROFILE> | <IMAGE\-NAME> <PROFILE.TOML>]
+Start an ostree compose using the selected blueprint and output type. Optionally start an upload. This command
+is only supported by osbuild\-composer, and requires the ostree REF and PARENT. \-\-size is in MiB.
 .TP
 .B compose types
 List the supported output types.
--- a/docs/man/livemedia-creator.1
+++ b/docs/man/livemedia-creator.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "LIVEMEDIA-CREATOR" "1" "Feb 12, 2020" "32.6" "Lorax"
+.TH "LIVEMEDIA-CREATOR" "1" "Oct 01, 2020" "32.12" "Lorax"
 .SH NAME
 livemedia-creator \- Live Media Creator Documentation
 .
--- a/docs/man/lorax-composer.1
+++ b/docs/man/lorax-composer.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "LORAX-COMPOSER" "1" "Feb 12, 2020" "32.6" "Lorax"
+.TH "LORAX-COMPOSER" "1" "Oct 01, 2020" "32.12" "Lorax"
 .SH NAME
 lorax-composer \- Lorax Composer Documentation
 .
@ -36,7 +36,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 Brian C. Lane <\fI\%bcl@redhat.com\fP>
 .UNINDENT
 .sp
-\fBlorax\-composer\fP is an API server that allows you to build disk images using
+\fBlorax\-composer\fP is a WELDR API server that allows you to build disk images using
 \fI\%Blueprints\fP to describe the package versions to be installed into the image.
 It is compatible with the Weldr project\(aqs bdcs\-api REST protocol. More
 information on Weldr can be found \fI\%on the Weldr blog\fP\&.
@ -44,6 +44,17 @@ information on Weldr can be found \fI\%on the Weldr blog\fP\&.
 Behind the scenes it uses \fI\%livemedia\-creator\fP and
 \fI\%Anaconda\fP to handle the
 installation and configuration of the images.
+.sp
+\fBNOTE:\fP
+.INDENT 0.0
+.INDENT 3.5
+\fBlorax\-composer\fP is now deprecated. It is being replaced by the
+\fBosbuild\-composer\fP WELDR API server which implements more features (eg.
+ostree, image uploads, etc.) You can still use \fBcomposer\-cli\fP and
+\fBcockpit\-composer\fP with \fBosbuild\-composer\fP\&. See the documentation or
+the \fI\%osbuild website\fP for more information.
+.UNINDENT
+.UNINDENT
 .SH IMPORTANT THINGS TO NOTE
 .INDENT 0.0
 .IP \(bu 2
--- a/docs/man/lorax.1
+++ b/docs/man/lorax.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "LORAX" "1" "Feb 12, 2020" "32.6" "Lorax"
+.TH "LORAX" "1" "Oct 01, 2020" "32.12" "Lorax"
 .SH NAME
 lorax \- Lorax Documentation
 .
@ -62,7 +62,8 @@ usage: lorax [\-h] \-p PRODUCT \-v VERSION \-r RELEASE [\-s REPOSITORY] [\-\-rep
             [\-\-add\-template\-var ADD_TEMPLATE_VARS] [\-\-add\-arch\-template ADD_ARCH_TEMPLATES]
             [\-\-add\-arch\-template\-var ADD_ARCH_TEMPLATE_VARS] [\-\-noverify] [\-\-sharedir SHAREDIR]
             [\-\-enablerepo [repo]] [\-\-disablerepo [repo]] [\-\-rootfs\-size ROOTFS_SIZE] [\-\-noverifyssl]
-             [\-\-dnfplugin DNFPLUGINS] [\-\-squashfs\-only] [\-\-dracut\-conf DRACUT_CONF] [\-\-dracut\-arg DRACUT_ARGS] [\-V]
+             [\-\-dnfplugin DNFPLUGINS] [\-\-squashfs\-only] [\-\-skip\-branding] [\-\-dracut\-conf DRACUT_CONF]
+             [\-\-dracut\-arg DRACUT_ARGS] [\-V]
             OUTPUTDIR
 .ft P
 .fi
@ -238,6 +239,11 @@ Default: []
 Use a plain squashfs filesystem for the runtime.
 .sp
 Default: False
+.TP
+.B\-\-skip\-branding
+Disable automatic branding package selection. Use \-\-installpkgs to add custom branding.
+.sp
+Default: False
 .UNINDENT
 .SS dracut arguments: (default: )
 .INDENT 0.0
@ -273,6 +279,33 @@ override the ones in the distribution repositories.
 .sp
 Under \fB\&./results/\fP will be the release tree files: .discinfo, .treeinfo, everything that
 goes onto the boot.iso, the pxeboot directory, and the boot.iso under \fB\&./images/\fP\&.
+.SH BRANDING
+.sp
+By default lorax will search for the first package that provides \fBsystem\-release\fP
+that doesn\(aqt start with \fBgeneric\-\fP and will install it. It then selects a
+corresponding logo package by using the first part of the system\-release package and
+appending \fB\-logos\fP to it. eg. fedora\-release and fedora\-logos.
+.SS Variants
+.sp
+If a \fBvariant\fP is passed to lorax it will select a \fBsystem\-release\fP package that
+ends with the variant name. eg. Passing \fB\-\-variant workstation\fP will select the
+\fBfedora\-release\-workstation\fP package if it exists. It will select a logo package
+the same way it does for non\-variants. eg. \fBfedora\-logos\fP\&.
+.sp
+If there is no package ending with the variant name it will fall back to using the
+first non\-generic package providing \fBsystem\-release\fP\&.
+.SS Custom Branding
+.sp
+If \fB\-\-skip\-branding\fP is passed to lorax it will skip selecting the
+\fBsystem\-release\fP, and logos packages and leave it up to the user to pass any
+branding related packages to lorax using \fB\-\-installpkgs\fP\&. When using
+\fBskip\-branding\fP you must make sure that you provide all of the expected files,
+otherwise Anaconda may not work as expected. See the contents of \fBfedora\-release\fP
+and \fBfedora\-logos\fP for examples of what to include.
+.sp
+Note that this does not prevent something else in the dependency tree from
+causing these packages to be included. Using \fB\-\-excludepkgs\fP may help if they
+are unexpectedly included.
 .SH RUNNING INSIDE OF MOCK
 .sp
 As of mock version 2.0 you no longer need to pass \fB\-\-old\-chroot\fP\&. You will,
--- a/docs/man/mkksiso.1
+++ b/docs/man/mkksiso.1
@ -1,6 +1,6 @@
 .\" Man page generated from reStructuredText.
 .
-.TH "MKKSISO" "1" "Feb 12, 2020" "32.6" "Lorax"
+.TH "MKKSISO" "1" "Oct 01, 2020" "32.12" "Lorax"
 .SH NAME
 mkksiso \- Make Kickstart ISO Utility Documentation
 .
--- a/etc/bash_completion.d/composer-cli
+++ b/etc/bash_completion.d/composer-cli
@ -3,7 +3,7 @@
 __composer_cli_flags="-h --help -j --json -s --socket --log -a --api --test -V"

 declare -A __composer_cli_cmds=(
-  [compose]="list start types status log cancel delete info metadata logs results image"
+  [compose]="list start start-ostree types status log cancel delete info metadata logs results image"
  [blueprints]="list show changes diff save delete depsolve push freeze tag undo workspace"
  [modules]="list"
  [projects]="list info"
@ -112,7 +112,7 @@ _composer_cli() {
            blueprints:freeze)
                COMPREPLY=($(compgen -W "$(__composer_blueprints) show save" -- "${cur}"))
            ;;
-            compose:start|blueprints:*)
+            compose:start|compose:start-ostree|blueprints:*)
                COMPREPLY=($(compgen -W "$(__composer_blueprints)" -- "${cur}"))
            ;;
            compose:cancel)
@ -143,10 +143,11 @@ _composer_cli() {
            compose:delete)
                COMPREPLY=($(compgen -W "$(__composer_composes finished failed)" -- "${cur}"))
            ;;
-            compose:start)
+            compose:start|compose:start-ostree)
+                subpos="$subcmd:$cmd_cword"
                if [ "$cmd_cword" == 3 ]; then
                    COMPREPLY=($(compgen -W "$(__composer_compose_types)" -- "${cur}"))
-                elif [ "$cmd_cword" == 5 ]; then
+                elif [ "$subpos" == "start:5" ] || [ "$subpos" == "start-ostree:7" ]; then
                    # If they have typed something looking like a path, use file completion
                    # otherwise suggest providers.
                    case "${cur}" in
@ -158,7 +159,7 @@ _composer_cli() {
                            COMPREPLY=($(compgen -W "$(__composer_provider_list)" -- "${cur}"))
                        ;;
                    esac
-                elif [ "$cmd_cword" == 6 ]; then
+                elif [ "$subpos" == "start:6" ] || [ "$subpos" == "start-ostree:8" ]; then
                    COMPREPLY=($(compgen -W "$(__composer_profile_list ${prev})" -- "${cur}"))
                fi
            ;;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brian C. Lane	050bc11189	New lorax documentation - 32.12	2020-10-01 16:14:24 -07:00
Brian C. Lane	5ea7569573	Automatic commit of package [lorax] release [32.12-1]. Created by command: /usr/bin/tito tag	2020-07-20 10:54:35 -07:00
Michel Alexandre Salim	265303de63	Fix EFI booting for ISOs generated by `mkksiso` If the original ISO contains both `efiboot.img` and `macboot.img`, the current `xorrisofs` invocation does not configure `efiboot.img` to be bootable, only `macboot.img`. This fix uses `>=` to compare `efimode` against `EFIBOOT`, since `MACBOOT` implies `EFIBOOT` as well. This is similar to the logic for `mkisofs`. Fixes #1046. Generated image confirmed to work, when comparing the reports: `xorriso -indev $PATH_TO_ISO -report_el_torito cmd` ``` ❯ diff -u ~/xorriso-report-{orig,new}.log --- /home/michel/xorriso-report-orig.log 2020-07-15 20:01:01.405289018 -0700 +++ /home/michel/xorriso-report-new.log 2020-07-15 20:01:19.183555423 -0700 @@ -1,6 +1,6 @@ --volid 'Fedora-S-dvd-x86_64-32' --volume_date uuid '2020042219432600' --boot_image isolinux system_area=--interval:imported_iso:0s-15s:zero_mbrpt,zero_gpt:'/home/michel/Downloads/Fedora-Server-netinst-x86_64-32-1.6.iso' +-volid 'Fedora-32-btrfs' +-volume_date uuid '2020071602410900' +-boot_image isolinux system_area=--interval:imported_iso:0s-15s:zero_mbrpt,zero_gpt:'/home/michel/src/github/michel-slm/luks-kickstarts/iso/Fedora-32-WS-20200715-3.iso' -boot_image any partition_cyl_align=on -boot_image any partition_offset=0 -boot_image any partition_hd_cyl=64 @@ -14,12 +14,6 @@ -boot_image any load_size=2048 -boot_image any boot_info_table=on -boot_image any next --boot_image any efi_path='/images/efiboot.img' --boot_image any platform_id=0xef --boot_image any emul_type=no_emulation --boot_image any load_size=11462656 --boot_image isolinux partition_entry=gpt_basdat --boot_image any next -boot_image any efi_path='/images/macboot.img' -boot_image any platform_id=0xef -boot_image any emul_type=no_emulation ``` ``` ❯ diff -u ~/xorriso-report-{orig,new5}.log --- /home/michel/xorriso-report-orig.log 2020-07-15 20:01:01.405289018 -0700 +++ /home/michel/xorriso-report-new5.log 2020-07-15 20:30:27.571644770 -0700 @@ -1,6 +1,6 @@ --volid 'Fedora-S-dvd-x86_64-32' --volume_date uuid '2020042219432600' --boot_image isolinux system_area=--interval:imported_iso:0s-15s:zero_mbrpt,zero_gpt:'/home/michel/Downloads/Fedora-Server-netinst-x86_64-32-1.6.iso' +-volid 'Fedora-32-btrfs' +-volume_date uuid '2020071603283100' +-boot_image isolinux system_area=--interval:imported_iso:0s-15s:zero_mbrpt,zero_gpt:'./iso/Fedora-32-WS-20200715-5.iso' -boot_image any partition_cyl_align=on -boot_image any partition_offset=0 -boot_image any partition_hd_cyl=64 @@ -17,7 +17,7 @@ -boot_image any efi_path='/images/efiboot.img' -boot_image any platform_id=0xef -boot_image any emul_type=no_emulation --boot_image any load_size=11462656 +-boot_image any load_size=11460608 -boot_image isolinux partition_entry=gpt_basdat -boot_image any next -boot_image any efi_path='/images/macboot.img' ``` Signed-off-by: Michel Alexandre Salim <michel@michel-slm.name> (cherry picked from commit `0b9841d5f7`)	2020-07-20 10:31:10 -07:00
Brian C. Lane	c91c25697c	lorax-composer: Add deprecation notice to documentation Related: rhbz#1844649 (cherry picked from commit `432a558ad6`)	2020-07-20 10:30:54 -07:00
Brian C. Lane	69dc6ca0a1	Automatic commit of package [lorax] release [32.11-1]. Created by command: /usr/bin/tito tag	2020-06-18 14:32:28 -07:00
Brian C. Lane	a66fce492c	lorax.spec: Add psmisc for fuser debugging of failed umounts in pylorax.imgutils Fixes #1016	2020-06-18 14:31:33 -07:00
Brian C. Lane	d34263a885	composer-cli: Disable retry counter on connection timeout urllib3 has a retry system that send the request again when the connection fails, times out, is redircted, etc. This turns off retries, which aren't very useful anyway.	2020-06-18 14:31:33 -07:00
Brian C. Lane	2ff1646e31	composer-cli: Change timeout to 5 minutes In some cases osbuild-composer with an empty cache can take longer than a minute to depsolve and start a compose.	2020-06-18 14:31:33 -07:00
Brian C. Lane	652e110efb	Automatic commit of package [lorax] release [32.10-1]. Created by command: /usr/bin/tito tag	2020-06-11 09:56:47 -07:00
Brian C. Lane	7a9ec10fc7	composer-cli: Return a better error with no value And add tests for the get_size function.	2020-06-10 11:11:35 -07:00
Brian C. Lane	0e4575305c	tests: Add tests for composer-cli compose start JSON POST	2020-06-09 15:22:31 -07:00
Brian C. Lane	c054d0184a	composer-cli: Update bash completion for start-ostree	2020-06-09 15:22:05 -07:00
Brian C. Lane	abf4bfe4b5	composer-cli: Add new start-ostree command This is used to start an ostree build, it is only supported on ostree-composer, and requires the ostree ref and parent. It may also include --size and optionally be uploaded.	2020-06-09 15:10:02 -07:00
Brian C. Lane	aa7b09944d	composer-cli: Add support for --size to compose start osbuild-composer can support user specified image sizes, this adds an optional argument, after start, to specify the size in MiB. eg. composer-cli compose start --size 2048 example-http-server qcow2 This only works when the backend is not 'lorax-composer', when it is the user will get a warning that it will be ignored.	2020-06-09 15:09:49 -07:00
Brian C. Lane	a0158b4089	Automatic commit of package [lorax] release [32.9-1]. Created by command: /usr/bin/tito tag	2020-05-05 14:44:29 -07:00
Brian C. Lane	434c938e67	Dockerfile.test: Switch to using F32 for testing	2020-05-05 11:43:56 -07:00
Alexander Todorov	b7ce3e5685	Don't use f-string without interpolation resolves pylint W1309(f-string-without-interpolation) (cherry picked from commit `2e585c98f3`)	2020-05-04 11:53:17 -07:00
Brian C. Lane	8045a95c63	lorax: Add --skip-branding cmdline argument Also document how branding currently works. See docs/lorax.rst Resolves: rhbz#1826479 (cherry picked from commit `c9c1283c56`)	2020-05-04 11:41:01 -07:00
Brian C. Lane	6a521624f8	tests: Add tests for _install_branding with and without variant This adds tests to make sure that the changes to _install_branding are working as expected. (cherry picked from commit `f94171bb0f`)	2020-05-04 11:40:56 -07:00
Brian C. Lane	e732e244ca	lorax: Update how the release package is chosen Previously the release package was chosen by picking the first package that provides 'system-release' that isn't named generic. This can cause branding issues with repos containing multiple system-release packages. This patch changes _install_branding so that it will give preference to a system-release package that ends with lowercase --variant name. If there isn't one it will fall back to the previous behavior. Resolves: rhbz#1472622 (cherry picked from commit `91d71b09a4`)	2020-05-04 11:40:56 -07:00
Brian C. Lane	1fd81854b6	Automatic commit of package [lorax] release [32.8-1]. Created by command: /usr/bin/tito tag	2020-03-20 11:37:51 -07:00
Brian C. Lane	05c9cb8649	ltmpl: Fix package logging format epoch wasn't included in the lorax-packages.log, but arch is. And for the debuginfo the epoch, including 0, is included. This should match the previous output. Resolves: rhbz#1815000 (cherry picked from commit `d6ce9c907d`)	2020-03-20 08:23:08 -07:00