Skip to content

Commit 0ca7162

Browse files
SQUASH – more small fixes
- root module can now be at root url - update ui module - static redirects - fixes around variables being removed
1 parent b353c5c commit 0ca7162

5 files changed

Lines changed: 19 additions & 12 deletions

File tree

site-content/site.template.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ output:
3232
clean: true
3333
dir: ./build/html
3434

35+
runtime:
36+
log:
37+
level: warn
38+
failure_level: error
39+
3540
antora:
3641
extensions:
3742
- require: '@antora/lunr-extension'

site-ui/Dockerfile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,16 @@ RUN apt-get update && \
3636
git \
3737
vim
3838

39-
ENV NODE_PACKAGE="node-${NODE_VERSION_ARG}-linux-x64.tar.gz"
40-
RUN wget https://nodejs.org/download/release/${NODE_VERSION_ARG}/${NODE_PACKAGE} && \
41-
tar -C /usr/local --strip-components 1 -xzf ${NODE_PACKAGE} && \
42-
rm ${NODE_PACKAGE}
39+
# Install Node.js with architecture detection
40+
RUN sh -c '\
41+
set -ex ;\
42+
NODE_PLATFORM=x64 ;\
43+
[ $(uname -m) = "aarch64" ] && NODE_PLATFORM=arm64 ;\
44+
NODE_TAR="node-${NODE_VERSION_ARG}-linux-${NODE_PLATFORM}.tar.gz" ;\
45+
wget -q "https://nodejs.org/download/release/${NODE_VERSION_ARG}/${NODE_TAR}" --no-check-certificate ;\
46+
tar -xzf "${NODE_TAR}" -C /usr/local --strip-components=1 ;\
47+
rm "${NODE_TAR}" ;\
48+
ln -s /usr/local/bin/node /usr/local/bin/nodejs'
4349

4450
RUN npm install -g npm@11.6.0
4551
RUN npm install -g gulp-cli@3.1.0

site-ui/preview-src/ui-model.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
antoraVersion: '2.3.1'
1+
antoraVersion: '3.1.14'
22
site:
33
title: Apache Cassandra
44
url: http://localhost:5252

site-ui/src/partials/body.hbs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,9 @@
33
<div id="mobile-docs-nav-burger" class="hidden">
44
<svg viewBox="0 0 24 24" width="36" height="36" stroke="#1c81a0" stroke-width="2.5" fill="none" stroke-linecap="round" stroke-linejoin="round" class="css-i6dzq1"><line x1="3" y1="12" x2="21" y2="12"></line><line x1="3" y1="6" x2="21" y2="6"></line><line x1="3" y1="18" x2="21" y2="18"></line></svg>
55
</div>
6-
{{#if env.DOCSEARCH_ENABLED}}
7-
<div class="docs-nav-item relative">
8-
<input id="search-input" type="text" placeholder="Search docs">
9-
</div>
10-
{{/if}}
6+
<div class="docs-nav-item relative">
7+
<input id="search-input" type="text" placeholder="Search docs">
8+
</div>
119
{{> nav-explore}}
1210
</div>
1311
<div class="cf relative">

site-ui/src/partials/footer-scripts.hbs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
{{#if (eq page.layout 'tutorials')}}
88
<script async src="{{{uiRootPath}}}/js/vendor/mark.js"></script>
99
{{/if}}
10-
{{#if (eq env.DOCSEARCH_ENGINE 'lunr')}}
1110
<script src="{{uiRootPath}}/js/vendor/lunr.js"></script>
1211
<script src="{{uiRootPath}}/js/vendor/search.js" id="search-script" data-base-path="{{or siteRootPath (or site.url siteRootUrl)}}" data-page-path="{{@root.page.url}}"></script>
1312
<script async src="{{uiRootPath}}/../search-index.js"></script>
14-
{{/if}}
1513
{{/if}}
1614
{{#with (resolvePage page.relativeSrcPath model=false)}}
1715
{{#unless (eq asciidoc.attributes.stem undefined)}}

0 commit comments

Comments
 (0)