Deploying to gh-pages from @ 88e9a20 🚀

ayu-highlight.css

@@ -8,7 +8,6 @@ Original by Dempfi (https://github.com/dempfi/ayu)
   overflow-x: auto;
   background: #191f26;
   color: #e6e1cf;
-  padding: 0.5em;
 }
 
 .hljs-comment,

css/chrome.css

@@ -208,24 +208,63 @@ pre {
 pre > .buttons {
     position: absolute;
     z-index: 100;
-    right: 5px;
-    top: 5px;
+    right: 0px;
+    top: 2px;
+    margin: 0px;
+    padding: 2px 0px;
 
     color: var(--sidebar-fg);
     cursor: pointer;
+    visibility: hidden;
+    opacity: 0;
+    transition: visibility 0.1s linear, opacity 0.1s linear;
+}
+pre:hover > .buttons {
+    visibility: visible;
+    opacity: 1
 }
 pre > .buttons :hover {
     color: var(--sidebar-active);
+    border-color: var(--icons-hover);
+    background-color: var(--theme-hover);
 }
 pre > .buttons i {
     margin-left: 8px;
 }
 pre > .buttons button {
-    color: inherit;
-    background: transparent;
-    border: none;
     cursor: inherit;
+    margin: 0px 5px;
+    padding: 3px 5px;
+    font-size: 14px;
+
+    border-style: solid;
+    border-width: 1px;
+    border-radius: 4px;
+    border-color: var(--icons);
+    background-color: var(--theme-popup-bg);
+    transition: 100ms;
+    transition-property: color,border-color,background-color;
+    color: var(--icons);
 }
+@media (pointer: coarse) {
+    pre > .buttons button {
+        /* On mobile, make it easier to tap buttons. */
+        padding: 0.3rem 1rem;
+    }
+}
+pre > code {
+    padding: 1rem;
+}
+
+/* FIXME: ACE editors overlap their buttons because ACE does absolute
+   positioning within the code block which breaks padding. The only solution I
+   can think of is to move the padding to the outer pre tag (or insert a div
+   wrapper), but that would require fixing a whole bunch of CSS rules.
+*/
+.hljs.ace_editor {
+  padding: 0rem 0rem;
+}
+
 pre > .result {
     margin-top: 10px;
 }

css/general.css

@@ -26,6 +26,16 @@ code {
     font-size: 0.875em; /* please adjust the ace font size accordingly in editor.js */
 }
 
+/* make long words/inline code not x overflow */
+main {
+    overflow-wrap: break-word;
+}
+
+/* make wide tables scroll if they overflow */
+.table-wrapper {
+    overflow-x: auto;
+}
+
 /* Don't change font size in headers. */
 h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
     font-size: unset;
@@ -80,8 +90,7 @@ h6:target::before {
 
 .content {
     overflow-y: auto;
-    padding: 0 15px;
-    padding-bottom: 50px;
+    padding: 0 5px 50px 5px;
 }
 .content main {
     margin-left: auto;

highlight.css

@@ -61,7 +61,6 @@
   overflow-x: auto;
   background: #f6f7f6;
   color: #000;
-  padding: 0.5em;
 }
 
 .hljs-emphasis {

highlight.js

@@ -1,3 +1,4 @@
+// hljs compiled with: node tools/build.js -t browser dockerfile modusfile
 /*!
   Highlight.js v11.5.0 (git: 3ea6652536)
   (c) 2006-2022 Ivan Sagalaev and other contributors
@@ -323,7 +324,7 @@ contains:[e.HASH_COMMENT_MODE,e.APOS_STRING_MODE,e.QUOTE_STRING_MODE,e.NUMBER_MO
 beginKeywords:"run cmd entrypoint volume add copy workdir label healthcheck shell",
 starts:{end:/[^\\]$/,subLanguage:"bash"}}],illegal:"</"}),grmr_modusfile:e=>{
 const t={
-built_in:["from","run","merge","copy","string_concat","string_eq","in_workdir","set_workdir","set_entrypoint","set_cmd","in_env","set_env","append_path","number_eq","number_gt","number_lt","number_geq","number_leq"]
+built_in:["from","run","merge","copy","string_concat","string_eq","in_workdir","set_workdir","set_entrypoint","set_cmd","in_env","set_env","set_label","append_path","number_eq","number_gt","number_lt","number_geq","number_leq"]
 },n={match:/[a-zA-Z0-9][a-zA-Z0-9_]*/,scope:"variable",relevance:0},s=[{
 scope:"string",begin:/f"/,end:/"/,relevance:0,contains:[e.BACKSLASH_ESCAPE,{
 scope:"meta",begin:/\$\{/,end:/\}/,contains:[n]}]},n,e.QUOTE_STRING_MODE],i={
@@ -336,4 +337,4 @@ scope:"variable",relevance:0},{match:/(?<==)\s*[a-zA-Z0-9][a-zA-Z0-9_]*/,
 scope:"variable",relevance:0},r,...s],illegal:""}}});const se=te
 ;for(const e of Object.keys(ne)){const t=e.replace("grmr_","").replace("_","-")
 ;se.registerLanguage(t,ne[e])}return se}()
-;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);
+;"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);

index.html

@@ -83,7 +83,7 @@
 
         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
             <div class="sidebar-scrollbox">
-                <ol class="chapter"><li class="chapter-item expanded "><a href="introduction.html"><strong aria-hidden="true">1.</strong> Introduction</a></li><li class="chapter-item expanded "><a href="tutorial.html"><strong aria-hidden="true">2.</strong> Tutorial</a></li><li class="chapter-item expanded "><a href="syntax.html"><strong aria-hidden="true">3.</strong> Syntax</a></li><li class="chapter-item expanded "><a href="semantics.html"><strong aria-hidden="true">4.</strong> Semantics</a></li><li class="chapter-item expanded "><div><strong aria-hidden="true">5.</strong> Library</div></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/predicates/index.html"><strong aria-hidden="true">5.1.</strong> Predicates</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/predicates/image.html"><strong aria-hidden="true">5.1.1.</strong> Image</a></li><li class="chapter-item expanded "><a href="library/predicates/layer.html"><strong aria-hidden="true">5.1.2.</strong> Layer</a></li><li class="chapter-item expanded "><div><strong aria-hidden="true">5.1.3.</strong> Logic</div></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/predicates/logic/number.html"><strong aria-hidden="true">5.1.3.1.</strong> Number</a></li><li class="chapter-item expanded "><a href="library/predicates/logic/string.html"><strong aria-hidden="true">5.1.3.2.</strong> String</a></li><li class="chapter-item expanded "><a href="library/predicates/logic/semver.html"><strong aria-hidden="true">5.1.3.3.</strong> SemVer</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="library/operators/index.html"><strong aria-hidden="true">5.2.</strong> Operators</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/operators/image.html"><strong aria-hidden="true">5.2.1.</strong> Image</a></li><li class="chapter-item expanded "><a href="library/operators/layer.html"><strong aria-hidden="true">5.2.2.</strong> Layer</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="foundations.html"><strong aria-hidden="true">6.</strong> Foundations</a></li><li class="chapter-item expanded "><a href="cli/index.html"><strong aria-hidden="true">7.</strong> Command Line Tool</a></li></ol>
+                <ol class="chapter"><li class="chapter-item expanded "><a href="introduction.html" class="active"><strong aria-hidden="true">1.</strong> Introduction</a></li><li class="chapter-item expanded "><a href="tutorial.html"><strong aria-hidden="true">2.</strong> Tutorial</a></li><li class="chapter-item expanded "><a href="syntax.html"><strong aria-hidden="true">3.</strong> Syntax</a></li><li class="chapter-item expanded "><a href="semantics.html"><strong aria-hidden="true">4.</strong> Semantics</a></li><li class="chapter-item expanded "><div><strong aria-hidden="true">5.</strong> Library</div></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/predicates/index.html"><strong aria-hidden="true">5.1.</strong> Predicates</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/predicates/image.html"><strong aria-hidden="true">5.1.1.</strong> Image</a></li><li class="chapter-item expanded "><a href="library/predicates/layer.html"><strong aria-hidden="true">5.1.2.</strong> Layer</a></li><li class="chapter-item expanded "><div><strong aria-hidden="true">5.1.3.</strong> Logic</div></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/predicates/logic/number.html"><strong aria-hidden="true">5.1.3.1.</strong> Number</a></li><li class="chapter-item expanded "><a href="library/predicates/logic/string.html"><strong aria-hidden="true">5.1.3.2.</strong> String</a></li><li class="chapter-item expanded "><a href="library/predicates/logic/semver.html"><strong aria-hidden="true">5.1.3.3.</strong> SemVer</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="library/operators/index.html"><strong aria-hidden="true">5.2.</strong> Operators</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="library/operators/image.html"><strong aria-hidden="true">5.2.1.</strong> Image</a></li><li class="chapter-item expanded "><a href="library/operators/layer.html"><strong aria-hidden="true">5.2.2.</strong> Layer</a></li></ol></li></ol></li><li class="chapter-item expanded "><a href="foundations.html"><strong aria-hidden="true">6.</strong> Foundations</a></li><li class="chapter-item expanded "><a href="cli/index.html"><strong aria-hidden="true">7.</strong> Command Line Tool</a></li></ol>
             </div>
             <div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
         </nav>

library/operators/image.html

@@ -159,7 +159,7 @@ <h1 id="image"><a class="header" href="#image">Image</a></h1>
 <p><a name="append-path"></a><code>::append_path(+path)</code>: append string to the PATH environment variable.</p>
 </li>
 <li>
-<p><a name="simple-set"></a><code>::set_env(+key, +value)</code>, <code>::set_entrypoint(+str_or_array)</code>, <code>::set_cmd(+array)</code>, <code>::set_workdir(+dir)</code>, <code>::set_user(+username)</code>: Set image properties.</p>
+<p><a name="simple-set"></a><code>::set_env(+key, +value)</code>, <code>::set_entrypoint(+str_or_array)</code>, <code>::set_cmd(+array)</code>, <code>::set_workdir(+dir)</code>, <code>::set_user(+username)</code>, <code>::set_label(+key, +value)</code>: Set image properties.</p>
 <p><code>::set_workdir</code> also allows specifying a relative path based on the input image's working directory. This will be resolved to an absolute path.</p>
 <p><code>::set_entrypoint</code> will clear any command the image has, to be consistent with the <code>ENTRYPOINT</code> command in Dockerfile.</p>
 <p>Example:</p>
@@ -169,7 +169,8 @@ <h1 id="image"><a class="header" href="#image">Image</a></h1>
     copy(&quot;./app&quot;, &quot;/&quot;),
     copy(&quot;./entrypoint.sh&quot;, &quot;/&quot;)
   )::set_entrypoint(&quot;/entrypoint.sh&quot;)
-   ::set_cmd([&quot;start&quot;]).
+   ::set_cmd([&quot;start&quot;])
+   ::set_label(&quot;org.opencontainers.image.vendor&quot;, &quot;Modus&quot;).
 </code></pre>
 </li>
 </ul>

library/operators/index.html

@@ -149,7 +149,7 @@ <h1 class="menu-title">Modus Documentation</h1>
                     <main>
                         <h1 id="operators"><a class="header" href="#operators">Operators</a></h1>
 <p>Operators begin with <code>::</code>; they can be applied to expressions to control the build process.</p>
-<table><thead><tr><th>Operator</th><th>From</th><th>To</th><th>Description</th></tr></thead><tbody>
+<div class="table-wrapper"><table><thead><tr><th>Operator</th><th>From</th><th>To</th><th>Description</th></tr></thead><tbody>
 <tr><td><a href="./image.html#copy"><code>::copy</code></a></td><td>Image</td><td>Layer</td><td>Copy file/directory to current image</td></tr>
 <tr><td><a href="./image.html#simple-set"><code>::set_env</code></a></td><td>Image</td><td>Image</td><td>Set environment variable</td></tr>
 <tr><td><a href="./image.html#simple-set"><code>::set_entrypoint</code></a></td><td>Image</td><td>Image</td><td>Set entrypoint</td></tr>
@@ -161,7 +161,7 @@ <h1 id="operators"><a class="header" href="#operators">Operators</a></h1>
 <tr><td><a href="./layer.html#in_env"><code>::in_env</code></a></td><td>Layer</td><td>Layer</td><td>Specify environment variables for layer commands</td></tr>
 <tr><td><a href="./layer.html#merge"><code>::merge</code></a></td><td>Layer</td><td>Layer</td><td>Merge layers</td></tr>
 </tbody></table>
-<!-- | [`::set_user`](./operators/image.md#set_user) | Image | Set user | -->
+</div><!-- | [`::set_user`](./operators/image.md#set_user) | Image | Set user | -->
 <!-- | [`::set_expose`](./operators/image.md#set_expose) | Image | Set exposed port | -->
 <!-- | [`::set_cmd`](./operators/image.md#set_cmd) | Image | Set default arguments to entrypoint | -->
 <!-- | [`::set_volume`](./operators/image.md#set_volume) | Image | Set volume | -->

library/predicates/index.html

@@ -159,7 +159,7 @@ <h1 id="predicates"><a class="header" href="#predicates">Predicates</a></h1>
 <li><code>-</code> means: This variable is an output to the predicate. It is usually non-instantiated, but may be if you want to check for a specific &quot;return value&quot;.</li>
 </ul>
 <p>For example, <code>run</code> has the signature <code>run(+cmdline)</code>, which means that the argument has to be initialised.</p>
-<table><thead><tr><th>Predicate</th><th>Kind</th><th>Description</th></tr></thead><tbody>
+<div class="table-wrapper"><table><thead><tr><th>Predicate</th><th>Kind</th><th>Description</th></tr></thead><tbody>
 <tr><td><a href="./image.html#from"><code>from</code></a></td><td>Image</td><td>Refer to existing local/registry image by its name</td></tr>
 <tr><td><a href="./layer.html#run"><code>run</code></a></td><td>Layer</td><td>Execute shell command</td></tr>
 <tr><td><a href="./layer.html#copy"><code>copy</code></a></td><td>Layer</td><td>Copy local file/directory</td></tr>
@@ -176,7 +176,7 @@ <h1 id="predicates"><a class="header" href="#predicates">Predicates</a></h1>
 <tr><td><a href="./logic/semver.html#semver_op"><code>semver_geq</code></a></td><td>Logic</td><td><code>&gt;=</code> for SemVer versions</td></tr>
 <tr><td><a href="./logic/semver.html#semver_op"><code>semver_leq</code></a></td><td>Logic</td><td><code>&lt;=</code> for SemVer versions</td></tr>
 </tbody></table>
-
+</div>
                     </main>
 
                     <nav class="nav-wrapper" aria-label="Page navigation">

print.html

@@ -485,7 +485,7 @@ <h2 id="negation"><a class="header" href="#negation">Negation</a></h2>
 <li><code>-</code> means: This variable is an output to the predicate. It is usually non-instantiated, but may be if you want to check for a specific &quot;return value&quot;.</li>
 </ul>
 <p>For example, <code>run</code> has the signature <code>run(+cmdline)</code>, which means that the argument has to be initialised.</p>
-<table><thead><tr><th>Predicate</th><th>Kind</th><th>Description</th></tr></thead><tbody>
+<div class="table-wrapper"><table><thead><tr><th>Predicate</th><th>Kind</th><th>Description</th></tr></thead><tbody>
 <tr><td><a href="library/predicates/./image.html#from"><code>from</code></a></td><td>Image</td><td>Refer to existing local/registry image by its name</td></tr>
 <tr><td><a href="library/predicates/./layer.html#run"><code>run</code></a></td><td>Layer</td><td>Execute shell command</td></tr>
 <tr><td><a href="library/predicates/./layer.html#copy"><code>copy</code></a></td><td>Layer</td><td>Copy local file/directory</td></tr>
@@ -502,7 +502,7 @@ <h2 id="negation"><a class="header" href="#negation">Negation</a></h2>
 <tr><td><a href="library/predicates/./logic/semver.html#semver_op"><code>semver_geq</code></a></td><td>Logic</td><td><code>&gt;=</code> for SemVer versions</td></tr>
 <tr><td><a href="library/predicates/./logic/semver.html#semver_op"><code>semver_leq</code></a></td><td>Logic</td><td><code>&lt;=</code> for SemVer versions</td></tr>
 </tbody></table>
-<div style="break-before: page; page-break-before: always;"></div><h1 id="image"><a class="header" href="#image">Image</a></h1>
+</div><div style="break-before: page; page-break-before: always;"></div><h1 id="image"><a class="header" href="#image">Image</a></h1>
 <ul>
 <li>
 <p><a name="from"></a><code>from(+imageref)</code>: Refer to existing local/registry image by its name.</p>
@@ -559,7 +559,7 @@ <h2 id="negation"><a class="header" href="#negation">Negation</a></h2>
 </ul>
 <div style="break-before: page; page-break-before: always;"></div><h1 id="operators"><a class="header" href="#operators">Operators</a></h1>
 <p>Operators begin with <code>::</code>; they can be applied to expressions to control the build process.</p>
-<table><thead><tr><th>Operator</th><th>From</th><th>To</th><th>Description</th></tr></thead><tbody>
+<div class="table-wrapper"><table><thead><tr><th>Operator</th><th>From</th><th>To</th><th>Description</th></tr></thead><tbody>
 <tr><td><a href="library/operators/./image.html#copy"><code>::copy</code></a></td><td>Image</td><td>Layer</td><td>Copy file/directory to current image</td></tr>
 <tr><td><a href="library/operators/./image.html#simple-set"><code>::set_env</code></a></td><td>Image</td><td>Image</td><td>Set environment variable</td></tr>
 <tr><td><a href="library/operators/./image.html#simple-set"><code>::set_entrypoint</code></a></td><td>Image</td><td>Image</td><td>Set entrypoint</td></tr>
@@ -571,7 +571,7 @@ <h2 id="negation"><a class="header" href="#negation">Negation</a></h2>
 <tr><td><a href="library/operators/./layer.html#in_env"><code>::in_env</code></a></td><td>Layer</td><td>Layer</td><td>Specify environment variables for layer commands</td></tr>
 <tr><td><a href="library/operators/./layer.html#merge"><code>::merge</code></a></td><td>Layer</td><td>Layer</td><td>Merge layers</td></tr>
 </tbody></table>
-<!-- | [`::set_user`](./operators/image.md#set_user) | Image | Set user | -->
+</div><!-- | [`::set_user`](./operators/image.md#set_user) | Image | Set user | -->
 <!-- | [`::set_expose`](./operators/image.md#set_expose) | Image | Set exposed port | -->
 <!-- | [`::set_cmd`](./operators/image.md#set_cmd) | Image | Set default arguments to entrypoint | -->
 <!-- | [`::set_volume`](./operators/image.md#set_volume) | Image | Set volume | -->
@@ -589,7 +589,7 @@ <h2 id="negation"><a class="header" href="#negation">Negation</a></h2>
 <p><a name="append-path"></a><code>::append_path(+path)</code>: append string to the PATH environment variable.</p>
 </li>
 <li>
-<p><a name="simple-set"></a><code>::set_env(+key, +value)</code>, <code>::set_entrypoint(+str_or_array)</code>, <code>::set_cmd(+array)</code>, <code>::set_workdir(+dir)</code>, <code>::set_user(+username)</code>: Set image properties.</p>
+<p><a name="simple-set"></a><code>::set_env(+key, +value)</code>, <code>::set_entrypoint(+str_or_array)</code>, <code>::set_cmd(+array)</code>, <code>::set_workdir(+dir)</code>, <code>::set_user(+username)</code>, <code>::set_label(+key, +value)</code>: Set image properties.</p>
 <p><code>::set_workdir</code> also allows specifying a relative path based on the input image's working directory. This will be resolved to an absolute path.</p>
 <p><code>::set_entrypoint</code> will clear any command the image has, to be consistent with the <code>ENTRYPOINT</code> command in Dockerfile.</p>
 <p>Example:</p>
@@ -599,7 +599,8 @@ <h2 id="negation"><a class="header" href="#negation">Negation</a></h2>
     copy(&quot;./app&quot;, &quot;/&quot;),
     copy(&quot;./entrypoint.sh&quot;, &quot;/&quot;)
   )::set_entrypoint(&quot;/entrypoint.sh&quot;)
-   ::set_cmd([&quot;start&quot;]).
+   ::set_cmd([&quot;start&quot;])
+   ::set_label(&quot;org.opencontainers.image.vendor&quot;, &quot;Modus&quot;).
 </code></pre>
 </li>
 </ul>

tomorrow-night.css

@@ -81,8 +81,6 @@
   overflow-x: auto;
   background: #1d1f21;
   color: #c5c8c6;
-  padding: 0.5em;
-  -webkit-text-size-adjust: none;
 }
 
 .coffeescript .javascript,