From 786fe547c24444c1df7000d27cf3e53430669f6f Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Wed, 6 Nov 2024 07:29:22 +0100
Subject: [PATCH] Shorten doc versions
---
.docs/changelog.md | 4 +-
.docs/index.md | 4 +-
.docs/kubernetes.md | 2 +-
.../extra.scssc | Bin 10506 -> 10940 bytes
.docs/stylesheets/extra.css | 4 +-
.docs/stylesheets/extra.scss | 2 +
.gitlab-ci.yml | 17 ++++----
mkdocs.yml | 4 +-
versions.json | 38 ++----------------
9 files changed, 25 insertions(+), 50 deletions(-)
diff --git a/.docs/changelog.md b/.docs/changelog.md
index e39afc4851..ddf83cb7a4 100644
--- a/.docs/changelog.md
+++ b/.docs/changelog.md
@@ -2,9 +2,9 @@
author: Martin Weise
---
-## v1.4.7 (2024-11-06)
+## v1.5.0 (2024-11-06)
-[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.4.7)
+[:simple-gitlab: GitLab Release](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/tags/v1.5.0)
!!! warning "Contains Breaking Changes"
diff --git a/.docs/index.md b/.docs/index.md
index 79db681b19..351edbf441 100644
--- a/.docs/index.md
+++ b/.docs/index.md
@@ -2,6 +2,8 @@
author: Martin Weise
---
+# DBRepo
+
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
@@ -10,7 +12,7 @@ author: Martin Weise
[](https://artifacthub.io/packages/helm/dbrepo/dbrepo){ tabindex=-1 }
[](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services){ tabindex=-1 }
-Documentation for version: [v1.5](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
+Documentation for version: [v1.5.0](https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/releases).
DBRepo is a repository for data in databases that are used from the beginning until the end of a research
project supporting data evolution, -citation and -versioning. It implements the query store of the
diff --git a/.docs/kubernetes.md b/.docs/kubernetes.md
index 54f88ab0ea..0fd067fac7 100644
--- a/.docs/kubernetes.md
+++ b/.docs/kubernetes.md
@@ -13,7 +13,7 @@ helm upgrade --install dbrepo \
-n dbrepo \
"oci://registry.datalab.tuwien.ac.at/dbrepo/helm/dbrepo" \
--values ./values.yaml \
- --version "1.5" \
+ --version "1.5.0" \
--create-namespace \
--cleanup-on-fail
```
diff --git a/.docs/stylesheets/.sass-cache/10990fa183107f4149f38216a4d00fe324a8131e/extra.scssc b/.docs/stylesheets/.sass-cache/10990fa183107f4149f38216a4d00fe324a8131e/extra.scssc
index c66d9e0bfba4de127388de9e8ad6f4212c1f5d36..2f3098a926efbb1d447f3f621898ced984e8f1a2 100644
GIT binary patch
delta 3216
zcmeAQ+7qg4tY@xg!j)`nkYr$DW^S06YHpmCXl$9BXq1*}oR(slW@(aQkZfsek(`uh
zyir$zg^_2n8;hI-udZ%xif%?}Dw{QDh_zZYo2L?|f|0So<X)CwM$yR+SqvEkCJVFb
z`3qVrI9OOKI%rrcIcVlv>j_v3ffP%D^{1q!C6?xt=q9D>Cg<nm7a<IjQOGFHNz^bh
zHqcQpG*#76FfvrtQ83h;+`wwXXgYZ>t30FZ<c&PyBAnLpnR3<&4z5UcOpax-nB2iC
zH2E5vlA;<+!rCa`T87hF)*;YZA>Ue#-C8u0%UV7YY|LZ>b{1BUF+r2vSVNq-t)(Gq
zq3XD;<uf_px<EWt3{&G!<YhpP;{>UcwN`M5pZu3KS{|FJ>Ihwv%h}?cdC+X;L9rRc
z)4{O02yO;QUKwmNh^1n!;7~l-lHF1so2hyTU6UuWuV&<*Y|CN9$Upg`n8M@<95ROd
z)?x<MqM7_)EM{P>ff6G8*7BKba1%g0(a95)r6zypn5Qg&<_7_5`Ah-0S`bfhvOkZU
z3pRC#PzI~R@GIjy6odFco;3q06|h!tV4M$EFJ@qE=wJ$VJ2WaC82jN`A?|Gy7M)zp
zmBc6v^|R1q0d6iv;mOk6DvZLD9k^BDGAxt3xFvLjAt54cEt&~tqK1etN{9$gKF=L1
zFM<{lBG&Sm{BT!@O!nqca=@kr5egt3@^D|lQZVC1BtzEnNSlF_@q<F(5?n1j1cYIZ
za9}(H*9LN}!DLVf2=k^eilc;pI5-5vC*R^#hs%IMfY02}TG7B-36w0vAz>kIEt&~t
zqK1VyN?3?b&gLs)l$cy0tHdY)x9O}b7l#DI6p6|A!BRQ=5CtleJ>?{HVUpIOnP4WW
z6%r^JLvnJTobF_HPO-_>0;%#+Fdsv+uavcXrYPL&Qj_-!WGiD+BZyFAEuU#Pd4r^y
zD>ijpsOsQB4vQWpeMS@&{Ge3I1#$(bG-NWEd{c0tyfm64rLE;N#o*ecC(jg8!>R^h
zxy<ByLSj5l2)m>w2}_$m&2eCIW`sKoo)#ovmO3zrBlJm5_7j#A6Nk$&eucY3d~&Vu
zQAT-Kta0<fQ-J*B1`$=b49nzGA`*=9ll8>q8RaMYiDyrqz`-)PNE9UICvG;GN5Tdy
z!YBq3fs`>UlkLPLIOHK|Kz?$Zm_FDzmC65^_$D6^<6=ZuVS{9JJJ<q{kr7b!oe~nd
zFk`GmGr>&M)FO|PAQdK`lc-cyg!vbmN))Z-Glk(E2k|r}Gs-B-V^fF7#EO&GNNPD^
zQ-jFFAhR^#kpWL74-qk-IC(9PG#5x6C>Jw5nrtI=QC<nnflAi$nc{E<DoxgrHp8k$
z8c9u~bSzdisz_@7N~>d4qll!&S;kzMfP1XvGp)f{2AeuWV1RsKjTsmMObFXR*%g#!
zxIt>gtrZ-Y1eqpl$@(&?fXfgSSZbUMDnnEt=|=@zhNw&il_4MnkTL`&X)T%wW}>DF
z6_heWb#k9vy|NlwpsRr#19uvTX8=kSSk)oQ50E-Y`GL(mL>30C!wd{xL|}kafXfeV
z5DQ#>_%ThkmC~H7qhP75j^<i*Yxzt`xNAW?naKvyM)KIy$s*KEzNwIm)htBw1Z0*I
z$mdwiQbsasp`sjCHAwE7yiieea-5*3D>io_LI-50GiK=2AVLSELL8J-Oh7D2P*SO7
zg6n`6dn&MCa$qt=XjTOkd(!d<xs!+tsbDRi=?JbLA1XO9>cCQ*xd6QU(}AQr9c$4{
zFcURt>7W!iI+J^qyOecdHbDy<T}aaviDwB4V65t--~kNMWd+V>*vv!ZGq5^%P{0eF
z^$7oiR7ijW55$rJ1>OcMfu{p=wgc02gl3(|W~wTTyC+Ah>f2_Nrdoj-|JGaz3Rv6q
URybPoAPtihBt<vRQY~Nx0G+SSVgLXD
delta 2786
zcmdlJ+7+a0tY@xg!ewA+WSnGZX_TC5kZP7}Xq0AVX_{nWoSc+unUZE^Y?)?ekeX^?
zxlvbwg^_Er8;jiJektk6nrvc|TUfjq)h1tHF=UjT%*3k4C^y-VRc!JxHmAumS(O-7
zC+}gEXOx*7s3^|KX)T{AYpvkmIysv?dh$$G5pH#Bg?wu{c5Bg0&dE>N<0l8QDJkk$
zD>`UcD>-Od8|7Qea9YbcM8H*XS<7cCgUtf5RIC*oA}25Bu$&yoCc>?UP&N5K$7)92
z$*Vby7<nfb@~ceNm*<--z{O?AYb|DAEt<&-#$pE68W0<xZs4_+&t!v}0^*5IW>l4$
zoXRy%na^4pMJ=DTe5L?gEr_Q$c^|Kw3pRBesOm8M$Jm0RfDhzBLy(aI)(Q@ct#I{X
z2G)iSreL>29pg|1*U3BiB6l^TAl$q4JY0-|le>6S7zHP<=TQaA7@6x^D;iiUfx<u#
z5)^{gqM2YOYETHG1cl&aJKk7%A+#V6vX;-}hubeSc^9ve3pO<f?}K#6!@UEGUdHVR
zL#*X9c|qPc11aSPd4C67J>2_(Fo!rWu7GO=x!7RxM-kD<O?)YgqA1}Y3JwR+$)5b`
zU>O@-QHbwFtwl4zOjO^CqWE5P@-6-{MzP6(0!oZxP;(_X#2_Y!P4<@u3Eu`wCQ7JG
z-YGAk3zM`K%>*-1jTf_)&qM@@_~d``x|2(}#3rv2OqG{_`3;&TC9LH$Md6;5n5-w1
zt&B~LAVQ6`e5T=K1!*;`W^p0ZO=c7p;}K;<67W@&<^owLXszJDBsSSYc%i%`ntLRz
z<uk?LS|lfPh^RSYQ-iQa3hZ0-Jk6wmuvl_(zKFCj)MN)HO-9Tp7lS#&f$=ZgcJayk
zL?p#T5mL9|QlgXJiX3H>g~k>iHy=FR%TE3vstT2{5|dz*ojgxMo>6x4K8ftf_rzqt
zEVIcqk~Wib#X&q!@v%-^f<qP(-?Ed>iR&}UP6oyFe<r@k1`=G1Fe4KsY><p=hZ_|E
zRsT~`LKkL?wP+@oiJCHGQ4*fqWIL%!WqFwYpeaJ$T0T=4?okj=V{)OavOG3*i0mmp
zSw>pR6`LAFN(7mu2@iW%_GCJah$)Z?aQ@^1vG_sB<izAP(ii0w&>X2?EuSe4ccjAP
zIWlHg)kq_$`6v^MRgEf=np|0RtZEdI)NGbDS0>;dYxzuTP!@5;rVbGxAYWKx2FN!=
zfPhqpf(k5d5K9~sAm14$&yw?HRGJJbFO;AuP=Z4Vl75uH<%QB@P<f#QPDP;d0w!rK
znh9p2rV1r+4uaK`%9H=e*DI@_1-J@IIRWAsfKmlkb%?S8qz+P6U^5SqhgHC3g)tL6
zlvO7CDoS&Mw1dkE6Q;>)r8OtdQM6Q6MRS;{wS1-|Tpx%hGkJlGkvukavIupPJ(ZHN
znuTaGfXs3Nc@nEx%1CAjD$8M2gXFHsg36+k<>W+NvAGKo5Fk69F;hemB4j`+#6c;-
z1jLdArHEuExDI$7rUVNn2PSERW@S)`CM}DQTaQR;a@O*hj^GL|P{oN+3!1R_%mv^@
zn-(OAX<3VAf|;nPNDHNG(VF~MrAt{GW)rk*(YBV)l!FHxh-V23V65t-P}Et0vlBM+
z5ZMW2o)tVO;N{Cyg#SS*B*1|OVo8AlZyJ`s(}FqMfvFauS!?n#H5JCn$*0xyCqEYy
K*zBWTzzhIx<7ZL;
diff --git a/.docs/stylesheets/extra.css b/.docs/stylesheets/extra.css
index d46da35109..20a4626dbb 100644
--- a/.docs/stylesheets/extra.css
+++ b/.docs/stylesheets/extra.css
@@ -1,5 +1,7 @@
:root,
[data-md-color-accent=indigo] {
+ --md-hue: 230;
+ --md-default-bg-color: hsla(230, 15%, 21%, 1);
--md-primary-fg-color: #006699;
--md-accent-fg-color: #005c8a;
/* darken 10% */
@@ -28,5 +30,3 @@ img.img-border {
.md-banner {
background-color: var(--md-primary-fg-color--dark); }
-
-/*# sourceMappingURL=extra.css.map */
diff --git a/.docs/stylesheets/extra.scss b/.docs/stylesheets/extra.scss
index 1262644f00..27a239a812 100644
--- a/.docs/stylesheets/extra.scss
+++ b/.docs/stylesheets/extra.scss
@@ -1,5 +1,7 @@
:root,
[data-md-color-accent=indigo] {
+ --md-hue: 230;
+ --md-default-bg-color: hsla(230, 15%, 21%, 1);
--md-primary-fg-color: #006699;
--md-accent-fg-color: #005c8a; /* darken 10% */
--md-primary-fg-color--dark: #00537c; /* darken 10% */
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 785bbc64c4..0a9c58518d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ variables:
DOCKER_HOST: "unix:///var/run/dind/docker.sock"
TESTCONTAINERS_RYUK_DISABLED: "false"
PYTHON_VERSION: "3.11"
+ DOC_VERSION: "1.5"
APP_VERSION: "1.5.0"
CHART_VERSION: "1.5.0"
CACHE_FALLBACK_KEY: ${CI_DEFAULT_BRANCH}
@@ -416,15 +417,15 @@ release-docs:
- "apk add --update alpine-sdk bash sed wget openssh jq curl"
- "pip install pipenv"
- "pip install -r ./requirements.txt"
- - "mkdir -p ./final/${APP_VERSION}/rest"
+ - "mkdir -p ./final/${DOC_VERSION}/rest"
script:
- "make gen-lib-doc gen-docs-doc package-config"
- - "cp -r ./lib/python/docs/build/html ./final/${APP_VERSION}/python" # sphinx
- - "cp .docs/.swagger/api.yaml ./final/${APP_VERSION}/rest/api.yaml" # swagger
- - "cp .docs/.swagger/swagger-ui.html ./final/${APP_VERSION}/rest/index.html" # swagger
- - "cp .docs/.swagger/custom.css ./final/${APP_VERSION}/rest/custom.css" # swagger
- - "cp -r ./site/* ./final/${APP_VERSION}" # mkdocs
- - "cp .docker/dist.tar.gz ./final/${APP_VERSION}/dist.tar.gz" # dist
+ - "cp -r ./lib/python/docs/build/html ./final/${DOC_VERSION}/python" # sphinx
+ - "cp .docs/.swagger/api.yaml ./final/${DOC_VERSION}/rest/api.yaml" # swagger
+ - "cp .docs/.swagger/swagger-ui.html ./final/${DOC_VERSION}/rest/index.html" # swagger
+ - "cp .docs/.swagger/custom.css ./final/${DOC_VERSION}/rest/custom.css" # swagger
+ - "cp -r ./site/* ./final/${DOC_VERSION}" # mkdocs
+ - "cp .docker/dist.tar.gz ./final/${DOC_VERSION}/dist.tar.gz" # dist
- "bash ./.gitlab/gen-badge.sh"
- eval $(ssh-agent -s)
- "mkdir -p /root/.ssh"
@@ -435,7 +436,7 @@ release-docs:
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa final.tar.gz $CI_DOC_USER@$CI_DOC_IP:final.tar.gz"
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa versions.json $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/versions.json"
- "scp -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa .docs/redirect.html $CI_DOC_USER@$CI_DOC_IP:/system/user/ifs/infrastructures/public_html/dbrepo/index.html"
- - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${APP_VERSION}; rm -rf ./final"'
+ - 'ssh -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa $CI_DOC_USER@$CI_DOC_IP "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; tar xzf ./final.tar.gz; rm -f ./final.tar.gz; cp -r ./final/* /system/user/ifs/infrastructures/public_html/dbrepo/${DOC_VERSION}; rm -rf ./final"'
release-libs:
stage: release
diff --git a/mkdocs.yml b/mkdocs.yml
index a4930e473e..22bf05b5ac 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
site_name: Database Repository
-site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5.0/
+site_url: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/1.5/
repo_url: https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services
repo_name: fda-services
site_author: Research Unit Data Science, Technische Universität Wien
@@ -121,7 +121,7 @@ markdown_extensions:
extra:
homepage: https://www.ifs.tuwien.ac.at/infrastructures/dbrepo/
version:
- default: 1.5.0
+ default: 1.5
provider: mike
social:
- icon: simple/artifacthub
diff --git a/versions.json b/versions.json
index 01ecfe72d1..8ba789267d 100644
--- a/versions.json
+++ b/versions.json
@@ -1,42 +1,12 @@
[
{
- "version": "1.5.0",
- "title": "1.5.0",
+ "version": "1.5",
+ "title": "1.5",
"aliases": []
},
{
- "version": "1.4.6",
- "title": "1.4.6",
- "aliases": []
- },
- {
- "version": "1.4.5",
- "title": "1.4.5",
- "aliases": []
- },
- {
- "version": "1.4.4",
- "title": "1.4.4",
- "aliases": []
- },
- {
- "version": "1.4.3",
- "title": "1.4.3",
- "aliases": []
- },
- {
- "version": "1.4.2",
- "title": "1.4.2",
- "aliases": []
- },
- {
- "version": "1.4.1",
- "title": "1.4.1",
- "aliases": []
- },
- {
- "version": "1.4.0",
- "title": "1.4.0",
+ "version": "1.4",
+ "title": "1.4",
"aliases": []
}
]
\ No newline at end of file
--
GitLab