aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmikus <peter.mikus@protonmail.ch>2023-03-16 08:33:29 +0000
committerPeter Mikus <peter.mikus@protonmail.ch>2023-03-16 08:45:06 +0000
commit90e7db16a6652847489be214372cadb2b882c61b (patch)
tree735a4cf21c46913323722d47eb89e4080a2ea054
parent22999c2df14eb455080ff0a09bf93dc795a4049f (diff)
feat(docs): Unify path in cdash
Signed-off-by: pmikus <peter.mikus@protonmail.ch> Change-Id: I1b26e0031743e49de79529e0939c9e833f0d50c1
-rw-r--r--csit.infra.dash/Dockerfile2
-rw-r--r--csit.infra.dash/app/app.ini2
-rw-r--r--csit.infra.dash/app/cdash/templates/base_layout.jinja211
-rwxr-xr-xcsit.infra.dash/do_release.sh2
-rw-r--r--csit.infra.dash/docker-compose.yaml4
5 files changed, 13 insertions, 8 deletions
diff --git a/csit.infra.dash/Dockerfile b/csit.infra.dash/Dockerfile
index ee4ae1edd9..8ed0633799 100644
--- a/csit.infra.dash/Dockerfile
+++ b/csit.infra.dash/Dockerfile
@@ -1,7 +1,7 @@
ARG PYTHON_VERSION=3.8
FROM python:${PYTHON_VERSION}-buster
-WORKDIR /app
+WORKDIR /var/app/current
COPY ./app/requirements.txt .
diff --git a/csit.infra.dash/app/app.ini b/csit.infra.dash/app/app.ini
index 0f93f34fbf..7ad49e2ef0 100644
--- a/csit.infra.dash/app/app.ini
+++ b/csit.infra.dash/app/app.ini
@@ -2,7 +2,7 @@
ini = :cdash
py-autoreload = 0
static-index = index.html
-static-map = /cdocs/=/app/cdocs/
+static-map = /cdocs/=/var/app/current/cdocs/
[cdash]
strict = true
diff --git a/csit.infra.dash/app/cdash/templates/base_layout.jinja2 b/csit.infra.dash/app/cdash/templates/base_layout.jinja2
index eb7fc17076..ff31c72178 100644
--- a/csit.infra.dash/app/cdash/templates/base_layout.jinja2
+++ b/csit.infra.dash/app/cdash/templates/base_layout.jinja2
@@ -16,7 +16,7 @@
<h1 class="text-white">
{{ title }}
</h1>
- <p class="lead">
+ <p class="lead">
{{ description }}
</p>
<p class="lead">
@@ -26,7 +26,7 @@
</a>
</p>
<p>
- <a href="/report/" class="btn btn-primary fw-bold w-25">
+ <a href="/report/" class="btn btn-primary fw-bold w-25">
{{ report_title }}
</a>
</p>
@@ -40,11 +40,16 @@
{{ news_title }}
</a>
</p>
+ <p>
+ <a href="/cdocs/" class="btn btn-primary fw-bold w-25">
+ Documentation
+ </a>
+ </p>
</p>
</main>
<footer class="mt-auto text-white-50">
- <p>Copyright © 2016-2022 <a href="https://fd.io" class="text-white">The Fast Data Project</a>, a series of LF Projects, LLC.</p>
+ <p>Copyright © 2016-2023 <a href="https://fd.io" class="text-white">The Fast Data Project</a>, a series of LF Projects, LLC.</p>
</footer>
</div>
{% endblock %}
diff --git a/csit.infra.dash/do_release.sh b/csit.infra.dash/do_release.sh
index 7b8a8d8226..87e3b3acb4 100755
--- a/csit.infra.dash/do_release.sh
+++ b/csit.infra.dash/do_release.sh
@@ -14,7 +14,7 @@ popd
pushd "../fdio.infra.terraform/"
pushd "terraform-aws-fdio-csit-dash-app-base"
-export BUILD_ID=47
+export BUILD_ID=49
export TF_VAR_application_version="${BUILD_ID-}"
export TF_LOG=INFO
rm -f terraform.tfstate
diff --git a/csit.infra.dash/docker-compose.yaml b/csit.infra.dash/docker-compose.yaml
index d709d3e264..d494d52838 100644
--- a/csit.infra.dash/docker-compose.yaml
+++ b/csit.infra.dash/docker-compose.yaml
@@ -11,6 +11,6 @@ services:
- "5000:5000"
user: "${UID}:${GID}"
volumes:
- - "${PWD}/app/:/app"
- - "${PWD}/../resources/libraries/python/jumpavg/:/app/cdash/jumpavg"
+ - "${PWD}/app/:/var/app/current"
+ - "${PWD}/../resources/libraries/python/jumpavg/:/var/app/current/cdash/jumpavg"
- "${HOME}/.aws:/.aws"