From bd7f9369d99002c48d84dde303aa08bbade2fe3b Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 7 Mar 2024 10:05:24 +0000
Subject: [PATCH] Debug
---
.docs/build-website.sh | 8 ++------
.docs/redirect.html | 4 ++--
.docs/scripts/extra.js | 2 ++
Dockerfile | 2 +-
4 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/.docs/build-website.sh b/.docs/build-website.sh
index 2cc64bc69f..8b0c9b96a7 100755
--- a/.docs/build-website.sh
+++ b/.docs/build-website.sh
@@ -1,6 +1,5 @@
#!/bin/bash
-INDEX_HTML=""
OVERRIDES_MAIN_HTML=""
SCRIPTS_EXTRA_JS=""
@@ -15,7 +14,6 @@ function generate_docs {
find .docs/ -type f -exec sed -i -e "s/__APPVERSION__/$1/g" {} \;
find .docs/ -type f -exec sed -i -e "s/__CHARTVERSION__/$1/g" {} \;
if [ "$1" = "latest" ]; then
- INDEX_HTML=$(cat .docs/redirect.html)
OVERRIDES_MAIN_HTML=$(cat .docs/overrides/main.html)
SCRIPTS_EXTRA_JS=$(cat .docs/scripts/extra.js)
else
@@ -71,8 +69,6 @@ done
# finalization
echo "==================================================="
-echo "Adding index.html from branch release-latest"
-echo $INDEX_HTML > .docs/redirect.html
-sed -i -e "s/__APPVERSION__/${APP_VERSION}/g" .docs/redirect.html
-cp ./.docs/redirect.html ./final/index.html
+echo "Moving default version $APP_VERSION docs to /"
+cp -r ./final/${APP_VERSION}/* ./final/
echo "==================================================="
diff --git a/.docs/redirect.html b/.docs/redirect.html
index 3615b646fd..a3737a67b6 100644
--- a/.docs/redirect.html
+++ b/.docs/redirect.html
@@ -5,7 +5,7 @@
<head>
<meta charset="UTF-8">
<title>Redirect Notice</title>
- <meta http-equiv="Refresh" content="10; url='//localhost:8000/infrastructures/dbrepo/__APPVERSION__/'" />
+ <meta http-equiv="Refresh" content="0; url='/infrastructures/dbrepo/__APPVERSION__/'" />
</head>
<body>
<h1>Redirect Notice</h1>
@@ -14,7 +14,7 @@
available at:
</p>
<p>
- <a href="//localhost:8000/infrastructures/dbrepo/__APPVERSION__/">//localhost:8000/infrastructures/dbrepo/__APPVERSION__/</a>
+ <a href="/infrastructures/dbrepo/__APPVERSION__/">/infrastructures/dbrepo/__APPVERSION__/</a>
</p>
</body>
</html>
\ No newline at end of file
diff --git a/.docs/scripts/extra.js b/.docs/scripts/extra.js
index 4768615e22..b007affb67 100644
--- a/.docs/scripts/extra.js
+++ b/.docs/scripts/extra.js
@@ -1,8 +1,10 @@
function getVersion() {
const segments = location.pathname.split('/');
if (segments.length >= 4) {
+ console.log('version', segments[3])
return segments[3];
} else {
+ console.log('default version __APPVERSION__')
return '__APPVERSION__';
}
}
diff --git a/Dockerfile b/Dockerfile
index a413165b11..0030985143 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,4 +17,4 @@ FROM nginx as runtime
WORKDIR /usr/share/nginx/html/infrastructures/dbrepo/
-COPY --from=build /app/final /usr/share/nginx/html/infrastructures/dbrepo/
+COPY --from=build /app/final /usr/share/nginx/html/infrastructures/dbrepo/
\ No newline at end of file
--
GitLab