From 7755120664e184476822072967b93a93ad7ff53d Mon Sep 17 00:00:00 2001
From: David Karlsson <35727626+dvdksn@users.noreply.github.com>
Date: Thu, 25 Apr 2024 12:08:28 +0200
Subject: [PATCH] fix: prune double leading slash in favicon url

Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
---
 {static/assets => assets}/favicons/docs.ico    | Bin
 {static/assets => assets}/favicons/docs@2x.ico | Bin
 layouts/_default/engine-api-baseof.html        |   6 +-----
 layouts/_default/hub-api-baseof.html           |   6 +-----
 layouts/partials/favicon.html                  |  17 +++++++++++++++++
 layouts/partials/meta.html                     |  17 +----------------
 static/assets/favicons/favicon.ico             | Bin 3542 -> 0 bytes
 7 files changed, 20 insertions(+), 26 deletions(-)
 rename {static/assets => assets}/favicons/docs.ico (100%)
 rename {static/assets => assets}/favicons/docs@2x.ico (100%)
 create mode 100644 layouts/partials/favicon.html
 delete mode 100644 static/assets/favicons/favicon.ico

diff --git a/static/assets/favicons/docs.ico b/assets/favicons/docs.ico
similarity index 100%
rename from static/assets/favicons/docs.ico
rename to assets/favicons/docs.ico
diff --git a/static/assets/favicons/docs@2x.ico b/assets/favicons/docs@2x.ico
similarity index 100%
rename from static/assets/favicons/docs@2x.ico
rename to assets/favicons/docs@2x.ico
diff --git a/layouts/_default/engine-api-baseof.html b/layouts/_default/engine-api-baseof.html
index 802d04e19d..c9888202e3 100644
--- a/layouts/_default/engine-api-baseof.html
+++ b/layouts/_default/engine-api-baseof.html
@@ -9,11 +9,7 @@
         content="Reference documentation and Swagger (OpenAPI) specification for the {{ .File.BaseFileName }} version of the API served by Docker Engine." />
     <meta charset="utf-8" />
     <!-- favicon -->
-    <meta name="msapplication-TileImage" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-    <meta property="og:image" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-    <link rel="apple-touch-icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-        sizes="129x128" />
-    <link rel="icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" sizes="129x128" />
+    {{ partialCached "favicon.html" "favicon" }}
     <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
     <link rel="canonical" href="{{ site.BaseURL }}/engine/api/v{{ site.Params.latest_engine_api_version }}/" />
     <style>
diff --git a/layouts/_default/hub-api-baseof.html b/layouts/_default/hub-api-baseof.html
index d47c1c67cd..bee7269ea6 100644
--- a/layouts/_default/hub-api-baseof.html
+++ b/layouts/_default/hub-api-baseof.html
@@ -9,11 +9,7 @@
     content="Reference documentation and Swagger (OpenAPI) specification for the {{ .File.BaseFileName }} API served by Docker Hub." />
   <meta charset="utf-8" />
   <!-- favicon -->
-  <meta name="msapplication-TileImage" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-  <meta property="og:image" content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" />
-  <link rel="apple-touch-icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-    sizes="129x128" />
-  <link rel="icon" type="image/x-icon" href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico" sizes="129x128" />
+  {{ partialCached "favicon.html" "favicon" }}
   <!-- make the latest API version the canonical page as that's what we want users to be using mostly -->
   <link rel="canonical" href="{{ site.BaseURL }}/docker-hub/api/latest/" />
   <style>
diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
new file mode 100644
index 0000000000..0893cdc33f
--- /dev/null
+++ b/layouts/partials/favicon.html
@@ -0,0 +1,17 @@
+{{- $favicon := resources.Get "favicons/docs@2x.ico" }}
+<link
+  rel="icon"
+  type="image/x-icon"
+  href="{{ $favicon.Permalink }}"
+  sizes="129x128"
+/>
+<link
+  rel="apple-touch-icon"
+  type="image/x-icon"
+  href="{{ $favicon.Permalink }}"
+  sizes="129x128"
+/>
+<meta
+  name="msapplication-TileImage"
+  content="{{ $favicon.Permalink }}"
+/>
diff --git a/layouts/partials/meta.html b/layouts/partials/meta.html
index 48f318a770..64fe5b8371 100644
--- a/layouts/partials/meta.html
+++ b/layouts/partials/meta.html
@@ -18,22 +18,7 @@
 <link rel="canonical" href="{{ .Permalink }}" />
 
 <!-- favicon -->
-<link
-  rel="icon"
-  type="image/x-icon"
-  href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-  sizes="129x128"
-/>
-<link
-  rel="apple-touch-icon"
-  type="image/x-icon"
-  href="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-  sizes="129x128"
-/>
-<meta
-  name="msapplication-TileImage"
-  content="{{ site.BaseURL }}/assets/favicons/docs@2x.ico"
-/>
+{{ partialCached "favicon.html" "favicon" }}
 <meta name="theme-color" content="#2496ed" />
 
 <!-- SEO -->
diff --git a/static/assets/favicons/favicon.ico b/static/assets/favicons/favicon.ico
deleted file mode 100644
index 523925f7bd7c93c1e9f3acf1242ca4b65c3e448f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3542
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
QF#rGn07*qoM6N<$f-gE^#{d8T