Merge pull request #15246 from crazy-max/move-assets

move resources to assets folder

404.md

@@ -15,7 +15,7 @@ occurred, if applicable.
 
 [**Click here to create a new ticket**](https://github.com/docker/docker.github.io/issues/new){:.newissue.button.primary-btn}
 
-[![404 page not found](/images/404-docs.png)](/ "Go to the homepage")
+[![404 page not found](/assets/images/404-docs.png)](/ "Go to the homepage")
 
 <script>
 let el = document.querySelector("a.newissue");

_includes/head.html

@@ -39,10 +39,10 @@
   <link rel="canonical" href="{{ site.docs_url }}{{ page.url }}" />
 
   <!-- favicon -->
-  <link rel="icon" type="image/x-icon" href="/favicons/docs@2x.ico" sizes="129x128">
-  <link rel="apple-touch-icon" type="image/x-icon" href="/favicons/docs@2x.ico" sizes="129x128">
-  <meta name="msapplication-TileImage" content="/favicons/docs@2x.ico">
-  <meta property="og:image" content="/favicons/docs@2x.ico"/>
+  <link rel="icon" type="image/x-icon" href="/assets/favicons/docs@2x.ico" sizes="129x128">
+  <link rel="apple-touch-icon" type="image/x-icon" href="/assets/favicons/docs@2x.ico" sizes="129x128">
+  <meta name="msapplication-TileImage" content="/assets/favicons/docs@2x.ico">
+  <meta property="og:image" content="/assets/favicons/docs@2x.ico"/>
   <meta name="theme-color" content="#2496ed" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -59,18 +59,18 @@
   {%- endcomment -%}
   {%- if page.layout == 'landing' -%}
   <!-- landing page scripts -->
-  <script defer src="/js/theme-switcher.js"></script>
-  <script defer src="/js/jquery.js"></script>
-  <script defer src="/js/bootstrap.min.js"></script>
+  <script defer src="/assets/js/theme-switcher.js"></script>
+  <script defer src="/assets/jquery/jquery.js"></script>
+  <script defer src="/assets/bootstrap/js/bootstrap.min.js"></script>
   {%- else -%}
-  <script defer src="/js/theme-switcher.js"></script>
-  <script defer src="/js/anchorlinks.js"></script>
-  <script defer src="/js/jquery.js"></script>
-  <script defer src="/js/bootstrap.min.js"></script>
-  <script defer src="/js/docs.js"></script>
+  <script defer src="/assets/js/theme-switcher.js"></script>
+  <script defer src="/assets/js/anchorlinks.js"></script>
+  <script defer src="/assets/jquery/jquery.js"></script>
+  <script defer src="/assets/bootstrap/js/bootstrap.min.js"></script>
+  <script defer src="/assets/js/docs.js"></script>
   {%- endif -%}
   {%- if site.local_search -%}
-  <script defer src="/js/search.js"></script>
+  <script defer src="/assets/js/search.js"></script>
   {%- endif -%}
 
   {%- comment -%}
@@ -83,13 +83,13 @@
   <link rel="preload" as="font" href="/assets/fontawesome/webfonts/fa-regular-400.woff2"       type="font/woff2" crossorigin="anonymous">
   <link rel="preload" as="font" href="/assets/fontawesome/webfonts/fa-solid-900.woff2"         type="font/woff2" crossorigin="anonymous">
   <link rel="preload" as="font" href="/assets/fontawesome/webfonts/fa-v4compatibility.woff2"   type="font/woff2" crossorigin="anonymous">
-  <link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Book.woff2"            type="font/woff2" crossorigin="anonymous">
-  <link rel="preload" as="font" href="/fonts/geomanist/hinted-Geomanist-Regular.woff2"         type="font/woff2" crossorigin="anonymous">
-  <link rel="preload" as="font" href="/fonts/glyphicons-halflings-regular.woff2"               type="font/woff2" crossorigin="anonymous">
+  <link rel="preload" as="font" href="/assets/fonts/geomanist/hinted-Geomanist-Book.woff2"            type="font/woff2" crossorigin="anonymous">
+  <link rel="preload" as="font" href="/assets/fonts/geomanist/hinted-Geomanist-Regular.woff2"         type="font/woff2" crossorigin="anonymous">
+  <link rel="preload" as="font" href="/assets/bootstrap/fonts/glyphicons-halflings-regular.woff2"               type="font/woff2" crossorigin="anonymous">
 
   <link rel="stylesheet" href="/assets/fontawesome/css/all.min.css">
-  <link rel="stylesheet" href="/css/bootstrap.min.css">
-  <link rel="stylesheet" href="/css/style.css" id="pagestyle">
+  <link rel="stylesheet" href="/assets/bootstrap/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/assets/css/style.css" id="pagestyle">
 
   <!-- SEO stuff -->
   <meta name="twitter:title" itemprop="title name" content="{{ page.title | default: page_title }}"/>
@@ -98,13 +98,13 @@
   <meta name="twitter:domain" content="{{ site.docs_url | replace_first: 'http://', '' | replace_first: 'https://', '' }}"/>
   <meta name="twitter:site" content="@docker_docs"/>
   <meta name="twitter:url" content="https://twitter.com/docker_docs"/>
-  <meta name="twitter:image:src" content="{{ site.docs_url }}/images/docs@2x.png"/>
+  <meta name="twitter:image:src" content="{{ site.docs_url }}/assets/images/docs@2x.png"/>
   <meta name="twitter:image:alt" content="Docker Documentation"/>
   <meta property="og:title" content="{{ page.title | default: page_title }}" />
   <meta property="og:description" content="{{ page.description | default: page_description | escape_once }}" />
   <meta property="og:type" content="website"/>
   <meta property="og:updated_time" itemprop="dateUpdated" content="{% if page.date %}{{ page.date | date_to_xmlschema }}{% else %}{{ site.time | date_to_xmlschema }}{% endif %}"/>
-  <meta property="og:image" itemprop="image primaryImageOfPage" content="{{ site.docs_url }}/images/docs@2x.png"/>
+  <meta property="og:image" itemprop="image primaryImageOfPage" content="{{ site.docs_url }}/assets/images/docs@2x.png"/>
   <meta property="og:locale" content="en_US" />
   <meta property="og:url" content="{{ site.docs_url }}{{ page.url }}" />
   <meta property="og:site_name" content="Docker Documentation" />

_includes/header.html

@@ -2,7 +2,7 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <a href="/">
-                <img class="logo" src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs" width="160" height="28" />
+                <img class="logo" src="/assets/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs" width="160" height="28" />
             </a>
         </div>
         <div class="navbar-collapse" aria-expanded="false" style="height: 1px;">

_includes/landing-page/dockercon-banner.html

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="row">
       <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
-        <img src="/images/dockercon.png" alt="dockercon" />
+        <img src="/assets/images/dockercon.png" alt="dockercon" />
         <h2>
           DockerCon 2022 On-Demand
         </h2>

_includes/landing-page/dockercon-wrapup-banner.html

@@ -2,7 +2,7 @@
   <div class="container">
     <div class="row">
       <div class="col-xs-12 col-md-6 col-lg-offset-1 col-lg-7">
-        <img src="/images/dockercon21.png" alt="dockercon" />
+        <img src="/assets/images/dockercon21.png" alt="dockercon" />
         <h2>
           Thank you for attending DockerCon21!
         </h2>

_includes/landing-page/extensions-banner.html

@@ -8,7 +8,7 @@
         <p>Use our SDK to build new functionality into Docker Desktop, extend its existing capabilities, and integrate additional developer tools. <br><br> Create and install an extension today and join our growing list of Extension Partners when you publish your extension to the Marketplace.</p>
         </div>
         <div class="col-xs-12 col-md-6 col-lg-4 text-center">
-            <img src="/images/extensions.PNG" alt="extensions" />
+            <img src="/assets/images/extensions.PNG" alt="extensions" />
             </div>
         <div class="col-xs-12 col-md-6 col-lg-4 text-center">
           <a class="btn" href="/desktop/extensions-sdk/" target="_blank">

_includes/landing-page/popular-videos.html

@@ -9,19 +9,19 @@
     <div class="row">
       <div class="col-xs-12 col-md-6 col-lg-12">
         <a class="video-item" href="https://youtu.be/gAGEar5HQoU" target="_blank" rel="noopener">
-          <img class="video-image" src="/images/video.svg" alt="video: How to get started with Docker" width="65" height="44" />
+          <img class="video-image" src="/assets/images/video.svg" alt="video: How to get started with Docker" width="65" height="44" />
           <div class="video-title">How to get started with Docker</div>
         </a>
       </div>
       <div class="col-xs-12 col-md-6 col-lg-12">
         <a class="video-item" href="https://youtu.be/xmLVNpyJ530?t=30" target="_blank" rel="noopener">
-          <img class="video-image" src="/images/video.svg" alt="video: How to build and test your Docker images in the Cloud" width="65" height="44" />
+          <img class="video-image" src="/assets/images/video.svg" alt="video: How to build and test your Docker images in the Cloud" width="65" height="44" />
           <div class="video-title">How to build and test your Docker images in the Cloud</div>
         </a>
       </div>
       <div class="col-xs-12 col-md-6 col-lg-12">
         <a class="video-item" href="https://youtu.be/QeQ2MH5f_BE?t=31" target="_blank" rel="noopener">
-          <img class="video-image" src="/images/video.svg" alt="video: Simplify all the things with Docker Compose"  width="65" height="44" />
+          <img class="video-image" src="/assets/images/video.svg" alt="video: Simplify all the things with Docker Compose"  width="65" height="44" />
           <div class="video-title">Simplify all the things with Docker Compose</div>
         </a>
       </div>

_includes/navigation.html

@@ -1,6 +1,6 @@
 <div class="logo-mobile">
     <a href="/">
-        <img src="/images/docker-icon.svg" alt="Docker Docs" title="Docker Docs" width="30" height="30" />
+        <img src="/assets/images/docker-icon.svg" alt="Docker Docs" title="Docker Docs" width="30" height="30" />
     </a>
 </div>
 <div class="search-form" id="search-div">

_layouts/engine-api.html

@@ -7,16 +7,16 @@
     <meta name="description" content="Reference documentation and Swagger (OpenAPI) specification for the v{{ page.name | replace: '.md' }} version of the API served by Docker Engine." />
     <meta charset="utf-8" />
     <!-- favicon -->
-    <meta name="msapplication-TileImage" content="/favicons/docs@2x.ico" />
-    <meta property="og:image" content="/favicons/docs@2x.ico" />
-    <link rel="apple-touch-icon" type="image/x-icon" href="/favicons/docs@2x.ico" sizes="129x128" />
-    <link rel="icon" type="image/x-icon" href="/favicons/docs@2x.ico" sizes="129x128" />
-    <link rel="stylesheet" type="text/css" href="/css/api-reference.css" />
+    <meta name="msapplication-TileImage" content="/assets/favicons/docs@2x.ico" />
+    <meta property="og:image" content="/assets/favicons/docs@2x.ico" />
+    <link rel="apple-touch-icon" type="image/x-icon" href="/assets/favicons/docs@2x.ico" sizes="129x128" />
+    <link rel="icon" type="image/x-icon" href="/assets/favicons/docs@2x.ico" sizes="129x128" />
+    <link rel="stylesheet" type="text/css" href="/assets/css/api-reference.css" />
     <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
     <link rel="canonical" href="{{ site.docs_url }}/engine/api/v{{ site.latest_engine_api_version }}/" />
 </head>
 <body>
 <redoc spec-url="/engine/api/{{ page.name | replace: '.md'}}.yaml" hide-hostname="true" suppress-warnings="true" lazy-rendering></redoc>
-<script src="/js/redoc.standalone.js"></script>
+<script src="/assets/redoc/redoc.standalone.js"></script>
 </body>
 </html>

_layouts/hub-api.html

@@ -7,16 +7,16 @@
     <meta name="description" content="Reference documentation and Swagger (OpenAPI) specification for the {{ page.name | replace: '.md' }} API served by Docker Hub." />
     <meta charset="utf-8" />
     <!-- favicon -->
-    <meta name="msapplication-TileImage" content="/favicons/docs@2x.ico" />
-    <meta property="og:image" content="/favicons/docs@2x.ico" />
-    <link rel="apple-touch-icon" type="image/x-icon" href="/favicons/docs@2x.ico" sizes="129x128" />
-    <link rel="icon" type="image/x-icon" href="/favicons/docs@2x.ico" sizes="129x128" />
-    <link rel="stylesheet" type="text/css" href="/css/api-reference.css" />
+    <meta name="msapplication-TileImage" content="/assets/favicons/docs@2x.ico" />
+    <meta property="og:image" content="/assets/favicons/docs@2x.ico" />
+    <link rel="apple-touch-icon" type="image/x-icon" href="/assets/favicons/docs@2x.ico" sizes="129x128" />
+    <link rel="icon" type="image/x-icon" href="/assets/favicons/docs@2x.ico" sizes="129x128" />
+    <link rel="stylesheet" type="text/css" href="/assets/css/api-reference.css" />
     <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
     <link rel="canonical" href="{{ site.docs_url }}/docker-hub/api/latest/" />
 </head>
 <body>
     <redoc spec-url="/docker-hub/api/{{ page.name | replace: '.md'}}.yaml" class="hub-api"></redoc>
-    <script src="/js/redoc.standalone.js"></script>
+    <script src="/assets/redoc/redoc.standalone.js"></script>
 </body>
 </html>

_layouts/landing.html

@@ -13,7 +13,7 @@
           <span class="icon-bar"></span>
         </button>
         <a class="navbar-brand" href="/">
-          <img src="/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs" width="160" height="28" />
+          <img src="/assets/images/docker-docs-logo.svg" alt="Docker Docs" title="Docker Docs" width="160" height="28" />
         </a>
       </div>
       <div class="collapse navbar-collapse" id="header-content">
@@ -174,7 +174,7 @@
           <!-- DESKTOP -->
           <div class="row active" data-tab="desktop" data-os="win">
             <div class="col-xs-12 col-md-4 col-lg-2 text-center">
-              <div class="image" style="background-image: url(/images/laptop.svg);"></div>
+              <div class="image" style="background-image: url(/assets/images/laptop.svg);"></div>
               <h5>Docker Desktop</h5>
               <div class="btn-group">
                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -244,7 +244,7 @@
           <!-- HUB -->
           <div class="row" data-tab="hub">
             <div class="col-xs-12 col-md-4 col-lg-2 text-center">
-              <div class="image" style="background-image: url(/images/hub.svg);"></div>
+              <div class="image" style="background-image: url(/assets/images/hub.svg);"></div>
               <h5>Hub</h5>
             </div>
             <div class="col-xs-12 col-md-4 col-lg-5">
@@ -273,7 +273,7 @@
           <!-- ENGINE -->
           <div class="row" data-tab="engine">
             <div class="col-xs-12 col-md-4 col-lg-2 text-center">
-              <div class="image" style="background-image: url(/images/engine.svg);"></div>
+              <div class="image" style="background-image: url(/assets/images/engine.svg);"></div>
               <h5>Engine</h5>
             </div>
             <div class="col-xs-12 col-md-4 col-lg-5">
@@ -299,7 +299,7 @@
             <div class="col-xs-12 col-md-4 col-lg-2 text-center">
               <div
                 class="image"
-                style="background-image: url(/images/Compose.png);"
+                style="background-image: url(/assets/images/Compose.png);"
               ></div>
               <h5>Compose</h5>
             </div>

_scss/_landing.scss

@@ -158,7 +158,7 @@ body.landing {
     @each $icon in $icons {
       &.#{$icon} {
         @extend %icon-card;
-        background-image: url("/images/#{$icon}.svg");
+        background-image: url("/assets/images/#{$icon}.svg");
       }
     }
 
@@ -202,7 +202,7 @@ body.landing {
     }
 
     &[target=_blank] {
-      background-image:    url(/images/arrow.svg);
+      background-image:    url(/assets/images/arrow.svg);
       background-position: top 10px right 10px;
       background-repeat:   no-repeat;
       background-size:     15px 15px;

_scss/_typography.scss

@@ -4,8 +4,8 @@
 
 @font-face {
     font-family: 'Geomanist Book';
-    src: url("../fonts/geomanist/hinted-Geomanist-Book.eot");
-    src: url("../fonts/geomanist/hinted-Geomanist-Book.eot?#iefix") format("embedded-opentype"), url("../fonts/geomanist/hinted-Geomanist-Book.woff2") format("woff2"), url("../fonts/geomanist/hinted-Geomanist-Book.woff") format("woff"), url("../fonts/geomanist/hinted-Geomanist-Book.ttf") format("truetype"), url("../fonts/geomanist/hinted-Geomanist-Book.svg#Geomanist-Book") format("svg");
+    src: url("../assets/fonts/geomanist/hinted-Geomanist-Book.eot");
+    src: url("../assets/fonts/geomanist/hinted-Geomanist-Book.eot?#iefix") format("embedded-opentype"), url("../assets/fonts/geomanist/hinted-Geomanist-Book.woff2") format("woff2"), url("../assets/fonts/geomanist/hinted-Geomanist-Book.woff") format("woff"), url("../assets/fonts/geomanist/hinted-Geomanist-Book.ttf") format("truetype"), url("../assets/fonts/geomanist/hinted-Geomanist-Book.svg#Geomanist-Book") format("svg");
     font-weight: normal;
     font-style: normal;
     font-display: swap;
@@ -13,8 +13,8 @@
 
 @font-face {
     font-family: 'Geomanist Regular';
-    src: url("../fonts/geomanist/hinted-Geomanist-Regular.eot");
-    src: url("../fonts/geomanist/hinted-Geomanist-Regular.eot?#iefix") format("embedded-opentype"), url("../fonts/geomanist/hinted-Geomanist-Regular.woff2") format("woff2"), url("../fonts/geomanist/hinted-Geomanist-Regular.woff") format("woff"), url("../fonts/geomanist/hinted-Geomanist-Regular.ttf") format("truetype"), url("../fonts/geomanist/hinted-Geomanist-Book.svg#Geomanist-Regular") format("svg");
+    src: url("../assets/fonts/geomanist/hinted-Geomanist-Regular.eot");
+    src: url("../assets/fonts/geomanist/hinted-Geomanist-Regular.eot?#iefix") format("embedded-opentype"), url("../assets/fonts/geomanist/hinted-Geomanist-Regular.woff2") format("woff2"), url("../assets/fonts/geomanist/hinted-Geomanist-Regular.woff") format("woff"), url("../assets/fonts/geomanist/hinted-Geomanist-Regular.ttf") format("truetype"), url("../assets/fonts/geomanist/hinted-Geomanist-Book.svg#Geomanist-Regular") format("svg");
     font-weight: normal;
     font-style: normal;
     font-display: swap;

_scss/_utilities.scss

@@ -79,7 +79,7 @@ img.inline {
     float: left;
     margin: 5px 8px 0 0;
     & input[type=text] {
-        background: rgba(0, 0, 0, 0.17) url("/images/search.png") no-repeat 10px 9px;
+        background: rgba(0, 0, 0, 0.17) url("/assets/images/search.png") no-repeat 10px 9px;
         border: 0;
         color: #0C5176;
         border-radius: 0;
@@ -91,7 +91,7 @@ img.inline {
 
 .nav-secondary input[type=search]
 {
-    background: rgba(0, 0, 0, 0.17) url("/images/search.png") no-repeat 10px 9px;
+    background: rgba(0, 0, 0, 0.17) url("/assets/images/search.png") no-repeat 10px 9px;
     border: 0;
     box-shadow: none;
     color: #fff;
@@ -108,14 +108,14 @@ img.inline {
 
 input[type=text] {
     margin: 0;
-    background: rgba(0, 0, 0, 0.17) url(/images/search.png) no-repeat 10px 9px;
+    background: rgba(0, 0, 0, 0.17) url(/assets/images/search.png) no-repeat 10px 9px;
     border: 1px solid transparent;
     box-shadow: none;
     transition: all 0.2s ease;
 }
 
 .nav-secondary .search-form input[type=search]:focus {
-    background: rgba(255, 255, 255, 0.17) url(/images/search.png) no-repeat 10px 9px;
+    background: rgba(255, 255, 255, 0.17) url(/assets/images/search.png) no-repeat 10px 9px;
 }
 
 .search-form input[type=search]::placeholder