From 86a1879956777b401d155f1c447bc48bd5557355 Mon Sep 17 00:00:00 2001
From: Hector Vido <hector_vido@yahoo.com.br>
Date: Wed, 4 Feb 2026 15:11:12 -0300
Subject: [PATCH] Upgrade hugo, organize folders and files

---
 .gitmodules                                |   6 +
 Dockerfile                                 |  12 +-
 Makefile                                   |   4 +-
 archetypes/default.md                      |   5 +
 hack/codeescape.sh                         |  11 -
 config.yaml => hugo.yaml                   |   0
 layouts/index.html                         |   3 -
 layouts/partials/head-css.html             |  49 ----
 layouts/partials/head.html                 | 325 ---------------------
 package-lock.json                          |   3 -
 themes/docsy                               |   2 +-
 themes/github.com/FortAwesome/Font-Awesome |   1 +
 themes/github.com/twbs/bootstrap           |   1 +
 13 files changed, 27 insertions(+), 395 deletions(-)
 create mode 100644 archetypes/default.md
 delete mode 100755 hack/codeescape.sh
 rename config.yaml => hugo.yaml (100%)
 delete mode 100644 layouts/index.html
 delete mode 100644 layouts/partials/head-css.html
 delete mode 100644 layouts/partials/head.html
 delete mode 100644 package-lock.json
 create mode 160000 themes/github.com/FortAwesome/Font-Awesome
 create mode 160000 themes/github.com/twbs/bootstrap

diff --git a/.gitmodules b/.gitmodules
index b76244d3..3bb4d12b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,9 @@
+[submodule "themes/github.com/twbs/bootstrap"]
+	path = themes/github.com/twbs/bootstrap
+	url = https://github.com/twbs/bootstrap.git
+[submodule "themes/github.com/FortAwesome/Font-Awesome"]
+	path = themes/github.com/FortAwesome/Font-Awesome
+	url = https://github.com/FortAwesome/Font-Awesome.git
 [submodule "themes/docsy"]
 	path = themes/docsy
 	url = https://github.com/google/docsy.git
diff --git a/Dockerfile b/Dockerfile
index 6d46a18a..0394a12c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,18 @@
-FROM klakegg/hugo:0.111.3-ext-ubuntu as builder
+FROM registry.access.redhat.com/ubi10/ubi as builder
+
+ARG HUGO_VERSION=0.155.2
+
+WORKDIR /src
+
+RUN dnf install -y golang git nodejs
+RUN curl -sL https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_linux-amd64.tar.gz \
+  | tar -C /usr/bin -xzf - hugo
 
 COPY . /src/
 
 RUN set -x && HUGO_ENV=production make generate
 
-FROM nginxinc/nginx-unprivileged:1.18-alpine
+FROM nginxinc/nginx-unprivileged:1.29-alpine
 
 COPY --from=builder /src/public/ /usr/share/nginx/html/
 COPY --from=builder /src/static/googlea8e04f239c597b8a.html /usr/share/nginx/html/
diff --git a/Makefile b/Makefile
index d8debd6d..b0159141 100644
--- a/Makefile
+++ b/Makefile
@@ -1,2 +1,4 @@
 generate:
-	npm install -D --unsafe-perm=true --save postcss postcss-cli autoprefixer && cd themes/docsy && git submodule update -f --init && cd ../.. && hugo --gc --minify
+	npm install --save-dev postcss postcss-cli autoprefixer && git submodule update -f --init && hugo --gc --minify
+image:
+	podman build -t ci-docs -f Dockerfile .	
diff --git a/archetypes/default.md b/archetypes/default.md
new file mode 100644
index 00000000..25b67521
--- /dev/null
+++ b/archetypes/default.md
@@ -0,0 +1,5 @@
++++
+date = '{{ .Date }}'
+draft = true
+title = '{{ replace .File.ContentBaseName "-" " " | title }}'
++++
diff --git a/hack/codeescape.sh b/hack/codeescape.sh
deleted file mode 100755
index 6ff22355..00000000
--- a/hack/codeescape.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-getRegex() {
-  echo -n "s/\b(?<![\`#])$1\b/\`$1\`/g"
-}
-
-for toEscape in ci-operator base_images build_root image_stream_tag ImageStream ImageStreamTag base_images git Dockerfile .ci-operator.yaml ImageStreamTags Namespace test_binary_build_commands binary_build_commands FROM Builds promotion tag_specification altest Pod true false presubmit postsubmit images src bin boskos min-count max-count cluster_profile OWNERS make ConfigMap config_updater; do
-  find content -name "*.md" -exec  perl -pi -e $(getRegex $toEscape) {} \;
- done
diff --git a/config.yaml b/hugo.yaml
similarity index 100%
rename from config.yaml
rename to hugo.yaml
diff --git a/layouts/index.html b/layouts/index.html
deleted file mode 100644
index f2c1b0ed..00000000
--- a/layouts/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<head>
-<meta http-equiv="refresh" content="0; url=/docs/" />
-</head>
diff --git a/layouts/partials/head-css.html b/layouts/partials/head-css.html
deleted file mode 100644
index a3d018e8..00000000
--- a/layouts/partials/head-css.html
+++ /dev/null
@@ -1,49 +0,0 @@
-
-{{ $scssMain := "scss/main.scss"}}
-{{ if .Site.IsServer }}
-{{/* Note the missing postCSS. This makes it snappier to develop in Chrome, but makes it look sub-optimal in other browsers. */}}
-{{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" true) }}
-<link href="{{ $css.RelPermalink }}" rel="stylesheet">
-{{ else }}
-{{ $css := resources.Get $scssMain | toCSS (dict "enableSourceMap" false) | postCSS | minify | fingerprint }}
-<link rel="preload" href="{{ $css.RelPermalink }}" as="style">
-<link href="{{ $css.RelPermalink }}" rel="stylesheet" integrity="{{ $css.Data.integrity }}">
-{{ end }}
-
-{{/* Everything above here is copied from themes/docsy/layouts/partials/head-css.html to add the below section */}}
-<link rel="stylesheet" href="https://cdn.datatables.net/1.10.25/css/jquery.dataTables.css" integrity="sha384-Vwj80kTHnbvFQKFx/DXnuzcgBarxFKFKVn0/CvmrVdyYhYHbg2e05M8TF4dskCwA" crossorigin="anonymous">
-<style>
-@media(min-width:992px) {
- .td-max-width-on-larger-screens,
- .td-content>pre,
- .td-content>.highlight,
- .td-content>.lead,
- .td-content>h1,
- .td-content>h2,
- .td-content>ul,
- .td-content>ol,
- .td-content>p,
- .td-content>blockquote,
- .td-content>dl dd,
- .td-content .footnotes,
- .td-content>.alert {
-  max-width:100%;
- }
-}
-
-td.details-control {
-    background: center / 80% no-repeat url('/caret_right_icon.png');
-    cursor: pointer;
-}
-tr.shown td.details-control {
-    background: center / 80% no-repeat url('/caret_down_icon.png');
-    cursor: pointer;
-}
-
-.card-body > .highlight,
-.card-body > .highlight pre {
-    overflow-x: auto;
-    max-width: 100%;
-    margin: 0;
-}
-</style>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
deleted file mode 100644
index b36d176c..00000000
--- a/layouts/partials/head.html
+++ /dev/null
@@ -1,325 +0,0 @@
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-{{ hugo.Generator }}
-{{- $outputFormat := partial "outputformat.html" . -}}
-
-{{ range .AlternativeOutputFormats -}}
-<link rel="{{ .Rel }}" type="{{ .MediaType.Type }}" href="{{ .Permalink | safeURL }}">
-{{ end -}}
-
-{{ if and hugo.IsProduction (ne $outputFormat "print") -}}
-<META NAME="ROBOTS" CONTENT="INDEX, FOLLOW">
-{{ else -}}
-<META NAME="ROBOTS" CONTENT="NOINDEX, NOFOLLOW">
-{{ end -}}
-
-{{ partialCached "favicons.html" . }}
-<title>{{ if .IsHome }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{ . }} | {{ end }}{{ .Site.Title }}{{ end }}</title>
-{{- template "_internal/opengraph.html" . -}}
-{{- template "_internal/schema.html" . -}}
-{{- template "_internal/twitter_cards.html" . -}}
-{{ if hugo.IsProduction }}
-{{ template "_internal/google_analytics_async.html" . }}
-{{ end }}
-{{ partialCached "head-css.html" . "asdf" }}
-<script
-        src="https://code.jquery.com/jquery-3.5.1.min.js"
-        integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0="
-        crossorigin="anonymous"></script>
-{{ if .Site.Params.offlineSearch }}
-<script
-        src="https://unpkg.com/lunr@2.3.8/lunr.min.js"
-        integrity="sha384-vRQ9bDyE0Wnu+lMfm57BlYLO0/XauFuKpVsZPs7KEDwYKktWi5+Kz3MP8++DFlRY"
-        crossorigin="anonymous"></script>
-{{end}}
-{{ if .Site.Params.prism_syntax_highlighting }}
-<!-- stylesheet for Prism -->
-<link rel="stylesheet" href="{{ "/css/prism.css" | relURL }}"/>
-{{ end }}
-{{ partial "hooks/head-end.html" . }}
-{{/* Everything above here is copied from themes/docsy/layouts/partials/head.html to add the below section */}}
-<script type="text/javascript" charset="utf8" src="https://cdn.datatables.net/1.10.25/js/jquery.dataTables.js"
-        integrity="sha384-9jwHdz3xcZ/aQmgwzEl+IfbIibihtBOx76/CoExUWGC11Nb4blmMdE8y2edqF9EF"
-        crossorigin="anonymous"></script>
-<script>
-    function format(d) {
-        return '<table cellpadding="5" cellspacing="0" border="0" style="padding-left:50px;">' +
-            '<tr>' +
-            '<td>RELEASE IMAGE:</td>' +
-            '<td>' + d.releaseImage + '</td>' +
-            '</tr>' +
-            '<tr>' +
-            '<td>LABELS:</td>' +
-            '<td>' + d.labels + '</td>' +
-            '</tr>' +
-            '</table>';
-    }
-
-    $(document).ready(function () {
-        $.fn.dataTable.ext.errMode = 'throw';
-        var table = $('#table_pools').DataTable({
-            "ajax": {
-                "url": "{{ $.Site.Params.api_v1_url }}/api/v1/clusterpools",
-                "dataType": "jsonp",
-            },
-            "columns": [
-                {
-                    "className": 'details-control',
-                    "orderable": false,
-                    "data": null,
-                    "defaultContent": ''
-                },
-                {"data": "namespace"},
-                {"data": "name"},
-                {"data": "ready"},
-                {"data": "standby"},
-                {"data": "size"},
-                {"data": "maxSize"},
-                {"data": "imageSet"},
-                {"data": "owner"},
-            ],
-            "order": [[1, 'asc']]
-        });
-
-        $('#table_pools tbody').on('click', 'td.details-control', function () {
-            var tr = $(this).closest('tr');
-            var row = table.row(tr);
-
-            if (row.child.isShown()) {
-                row.child.hide();
-                tr.removeClass('shown');
-            } else {
-                row.child(format(row.data())).show();
-                tr.addClass('shown');
-            }
-        });
-
-        if ($("#m-docsarchitectureci-operator").hasClass("active")) {
-            $.ajax({
-                url: "{{ $.Site.Params.api_v1_url }}/api/v1/clusters",
-                dataType: 'jsonp',
-                success: function (res) {
-                    $.each(res.data, function (index, item) {
-                        if (item['error']) {
-                            $('#hypershift_supported_versions').text(item['error']);
-                            return;
-                        }
-                        if (item['cluster'] === 'hosted-mgmt') {
-                            $('#hypershift_supported_versions').text(item["hypershiftSupportedVersions"]);
-                        }
-                    });
-                },
-                error: function (xhr) {
-                    $("#hypershift_supported_versions").text('failed to load the hosted-mgmt cluster info: status ' + xhr.status);
-                },
-            });
-        }
-
-        if ($("#m-docsgetting-starteduseful-links").hasClass("active")) {
-            $.ajax({
-                url: "{{ $.Site.Params.api_v1_url }}/api/v1/clusters",
-                dataType: 'jsonp',
-                success: function (res) {
-                    $.each(res.data, function (index, item) {
-                        if (item['error']) {
-                            $("#ul_clusters").append('<li>' + item["cluster"] + ': ' + item['error'] + '</li>');
-                            return;
-                        }
-                        var description = item['product'] + ' ' + item['version'] + ' cluster on ' + item['cloud'];
-                        if (item['cluster'] === 'app.ci') {
-                            description = description + ' containing most Prow services.';
-                        } else if (item['cluster'] === 'core-ci') {
-                            description = description + ' to replace app.ci (WIP).';
-                        } else if (item['cluster'] === 'hosted-mgmt') {
-                            description = description + ' containing a Hive control plane.';
-                        } else if (!item['cluster'].startsWith('build')) {
-                            description = description + ' used for ' + item['cluster'].replace(/\d+/g, '').toUpperCase() + ' tests, not managed by DPTP.';
-                        } else {
-                            description = description + ' that executes a growing subset of the jobs.'
-                        }
-                        $("#ul_clusters").append('<li><a href="https://' + item["consoleHost"] + '/">' + item["cluster"] + '</a>: ' + description + '</li>');
-                        $("#progress").hide();
-                    });
-                },
-                error: function (xhr) {
-                    $("#progress").text('failed to load the cluster info: status ' + xhr.status);
-                },
-            });
-        }
-    });
-
-    $(document).ready(function () {
-        function formatDate(timestamp) {
-            const d = new Date(timestamp * 1000);
-            let formattedDate = `${d.getMonth() + 1}-${d.getDate()}--${d.getFullYear()}`;
-            const hours = d.getHours().toString().padStart(2, 0);
-            const minutes = d.getMinutes().toString().padStart(2, 0);
-            const formattedTime = `${hours}:${minutes}`;
-            return `${formattedDate} ${formattedTime}`;
-        }
-
-
-        function formatLinks(reply) {
-            return makeLinksClickable(formatSlackLinks(reply))
-        }
-
-        // Replaces slack links (URL|text) with html links (<a href="URL">text</a>)
-        function formatSlackLinks(text) {
-            return text.replace(/`?([^`\s]+)\|([^`\s]+)`?/g, '<a href=' + '"$1"' + '>$2</a>');
-        }
-
-        // Replaces plain URLs with html links (<a href="URL">URL</a>)
-        function makeLinksClickable(text) {
-            const regex = /(<a href[^>]*>.*?<\/a>|(?:https?:\/\/|www\.)\S+)/g;
-
-            return text.replace(regex, function(match) {
-                if (match.startsWith('<a href')) {
-                    return match;
-                }
-                // Ensure URL starts with http:// or https://
-                let fullUrl = match.startsWith('www.') ? 'https://' + match : match;
-                return '<a href="' + fullUrl + '">' + match + '</a>';
-            });
-        }
-
-        $.fn.dataTable.ext.errMode = 'throw';
-        var table = $('#table_helpdesk_faq').DataTable({
-            "ajax": {
-                "url": "{{ $.Site.Params.helpdesk_faq_api_url }}",
-                "dataType": "jsonp",
-            },
-            "columns": [
-                {
-                    "className": 'details-control',
-                    "orderable": false,
-                    "data": null,
-                    "defaultContent": ''
-                },
-                {"data": "question.topic"},
-                {
-                    "data": "question.subject",
-                    "render": function (data, type, row, meta) {
-                        return formatLinks(data)
-                    }
-                },
-                {
-                    "data": "question.body",
-                    "render": function (data, type, row, meta) {
-                        return formatLinks(data)
-                    }
-                },
-                {
-                    "data": "timestamp",
-                    "render": function (data, type, row, meta) {
-                        return formatDate(data);
-                    }
-
-                },
-                {
-                    "data": "thread_link",
-                    "render": function (data, type, row, meta) {
-                        if (data !== "") {
-                            return "<a href=\"" + data + "\">Thread</a>"
-                        }
-                        return ""
-                    }
-                }
-            ]
-        });
-
-        function replies(item) {
-            let formatted = '<table width="100%">';
-
-            formatted += '<head><th>Type</th><th>Reply</th><th>User</th><th>Date</th></head>'
-            console.log(item)
-            $.each(item.contributing_info, function (index, answer) {
-                formatted += '<tr>' +
-                    '<td>Additional Context</td><td>' +
-                    formatLinks(answer["body"]) +
-                    '</td><td>' +
-                    answer["author"] +
-                    '</td><td>' +
-                    formatDate(answer["timestamp"]) +
-                    '</td></tr>';
-            });
-            $.each(item.answers, function (index, answer) {
-                formatted += '<tr>' +
-                    '<td>Answer</td><td>' +
-                    formatLinks(answer["body"]) +
-                    '</td><td>' +
-                    answer["author"] +
-                    '</td><td>' +
-                    formatDate(answer["timestamp"]) +
-                    '</td></tr>';
-            });
-
-            formatted += '</table>';
-
-            return formatted;
-        }
-
-        $('#table_helpdesk_faq tbody').on('click', 'td.details-control', function () {
-            var tr = $(this).closest('tr');
-            var row = table.row(tr);
-
-            if (row.child.isShown()) {
-                row.child.hide();
-                tr.removeClass('shown');
-            } else {
-                row.child(replies(row.data())).show();
-                tr.addClass('shown');
-            }
-        });
-    });
-
-    $(document).ready(function () {
-        $.fn.dataTable.ext.errMode = 'throw';
-        var table = $('#table_registries').DataTable({
-            "paging": false,
-            "ordering": false,
-            "info": false,
-            "searching": false,
-            "ajax": {
-                "url": "{{ $.Site.Params.api_v1_url }}/api/v1/clusters?skipHive=true",
-                "dataType": "jsonp",
-            },
-            "columns": [
-                {
-                    "data": "cluster",
-                    "render": function (data, type, row, meta) {
-                        if (row['cluster'] === 'qci') {
-                            return '-';
-                        }
-                        return '<a href="https://' + row['consoleHost'] + '/">' + data + '</a>';
-                    }
-                },
-                {
-                    "data": "registryHost",
-                    "render": function (data, type, row, meta) {
-                        if (row['cluster'] === 'qci') {
-                            return 'quay-proxy.ci.openshift.org/openshift/ci';
-                        }
-                        return '<a href="https://' + row['registryHost'] + '/">' + data + '</a>';
-                    }
-                },
-                {
-                    "data": "description",
-                    "render": function (data, type, row, meta) {
-                        var data = "contains images either built in Prow jobs or imported from QCI"
-                        if (row['cluster'] === 'app.ci') {
-                            data = 'the CI registry with published images';
-                        } else if (row['cluster'] === 'hosted-mgmt') {
-                            data = '';
-                        } else if (row['cluster'] === 'arm01' || row['cluster'] === 'vsphere') {
-                            data = data + '; only open to ' + row['cluster'].replace(/\d+/g, '').toUpperCase() + ' admins';
-                        } else if (row['cluster'] === 'qci') {
-                            data = 'the authoritative CI registry and the source of truth of all CI images';
-                        }
-                        return data;
-                    }
-                },
-            ]
-        });
-        table.row.add({cluster: 'qci'});
-    });
-</script>
diff --git a/package-lock.json b/package-lock.json
deleted file mode 100644
index 48e341a0..00000000
--- a/package-lock.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "lockfileVersion": 1
-}
diff --git a/themes/docsy b/themes/docsy
index b2ce2477..bbf68d4c 160000
--- a/themes/docsy
+++ b/themes/docsy
@@ -1 +1 @@
-Subproject commit b2ce24771935100ef840a942192c7b303e93a7df
+Subproject commit bbf68d4caae52e8c9a89964c3d04b383ee678d44
diff --git a/themes/github.com/FortAwesome/Font-Awesome b/themes/github.com/FortAwesome/Font-Awesome
new file mode 160000
index 00000000..af620534
--- /dev/null
+++ b/themes/github.com/FortAwesome/Font-Awesome
@@ -0,0 +1 @@
+Subproject commit af620534bfc3c2d4cbefcfeec29603bbe7809e64
diff --git a/themes/github.com/twbs/bootstrap b/themes/github.com/twbs/bootstrap
new file mode 160000
index 00000000..25aa8cc0
--- /dev/null
+++ b/themes/github.com/twbs/bootstrap
@@ -0,0 +1 @@
+Subproject commit 25aa8cc0b32f0d1a54be575347e6d84b70b1acd7