fix #130 duckdb health, drop sha- prefix from image tags
- stack.toml: db.aco → data/aco.duckdb (matches volume mount)
- rebuild-all.yml: tags use ${CI_COMMIT_SHA:0:8} not sha-...
- update conf tests for new path
This commit is contained in:
@@ -30,7 +30,7 @@ steps:
|
||||
dockerfile: notebooks/Dockerfile
|
||||
context: notebooks/
|
||||
tags:
|
||||
- "sha-${CI_COMMIT_SHA:0:8}"
|
||||
- "${CI_COMMIT_SHA:0:8}"
|
||||
- latest
|
||||
|
||||
- name: build-push-zotero
|
||||
@@ -41,7 +41,7 @@ steps:
|
||||
dockerfile: zotero/Dockerfile
|
||||
context: zotero/
|
||||
tags:
|
||||
- "sha-${CI_COMMIT_SHA:0:8}"
|
||||
- "${CI_COMMIT_SHA:0:8}"
|
||||
- latest
|
||||
|
||||
- name: prep-docs-context
|
||||
@@ -60,7 +60,7 @@ steps:
|
||||
dockerfile: docs/Dockerfile
|
||||
context: .
|
||||
tags:
|
||||
- "sha-${CI_COMMIT_SHA:0:8}"
|
||||
- "${CI_COMMIT_SHA:0:8}"
|
||||
- latest
|
||||
depends_on:
|
||||
- prep-docs-context
|
||||
@@ -73,7 +73,7 @@ steps:
|
||||
dockerfile: api/Dockerfile
|
||||
context: .
|
||||
tags:
|
||||
- "sha-${CI_COMMIT_SHA:0:8}"
|
||||
- "${CI_COMMIT_SHA:0:8}"
|
||||
- latest
|
||||
|
||||
- name: build-push-mc
|
||||
@@ -84,7 +84,7 @@ steps:
|
||||
dockerfile: rustfs/Dockerfile.mc
|
||||
context: rustfs/
|
||||
tags:
|
||||
- "sha-${CI_COMMIT_SHA:0:8}"
|
||||
- "${CI_COMMIT_SHA:0:8}"
|
||||
- latest
|
||||
|
||||
- name: scan-notebooks
|
||||
@@ -137,7 +137,7 @@ steps:
|
||||
- /home/kert/stack:/home/kert/stack
|
||||
commands:
|
||||
- cd /home/kert/stack
|
||||
- TAG=sha-${CI_COMMIT_SHA:0:8}
|
||||
- TAG=${CI_COMMIT_SHA:0:8}
|
||||
- FQDN=gitea.homelab.fhirworx.io
|
||||
- for SVC in notebooks zotero docs api mc; do
|
||||
docker pull $FQDN/homelab/$SVC:$TAG &&
|
||||
|
||||
@@ -34,7 +34,7 @@ db_backend = "trino"
|
||||
storage_backend = "s3"
|
||||
|
||||
[db]
|
||||
aco = "notebooks/aco.duckdb"
|
||||
aco = "data/aco.duckdb"
|
||||
bib = "data/bib.sqlite"
|
||||
zotero = "zotero/data/zotero.sqlite"
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ class TestCfg:
|
||||
assert "db" in cfg
|
||||
|
||||
def test_db_aco_value(self) -> None:
|
||||
assert cfg.db.aco == "notebooks/aco.duckdb"
|
||||
assert cfg.db.aco == "data/aco.duckdb"
|
||||
|
||||
def test_db_bib_value(self) -> None:
|
||||
assert cfg.db.bib == "data/bib.sqlite"
|
||||
@@ -38,7 +38,7 @@ class TestCfg:
|
||||
|
||||
def test_dict_access(self) -> None:
|
||||
val = cfg["db"]["aco"]
|
||||
assert val == "notebooks/aco.duckdb"
|
||||
assert val == "data/aco.duckdb"
|
||||
|
||||
def test_to_dict(self) -> None:
|
||||
d = cfg.db.to_dict()
|
||||
@@ -68,7 +68,7 @@ class TestPath:
|
||||
|
||||
def test_path_resolves_relative_to_root(self) -> None:
|
||||
p = path("db.aco")
|
||||
assert p == ROOT / "notebooks/aco.duckdb"
|
||||
assert p == ROOT / "data/aco.duckdb"
|
||||
|
||||
def test_path_nested_key(self) -> None:
|
||||
p = path("db.bib")
|
||||
@@ -78,7 +78,7 @@ class TestPath:
|
||||
class TestReload:
|
||||
def test_reload_does_not_raise(self) -> None:
|
||||
reload()
|
||||
assert cfg.db.aco == "notebooks/aco.duckdb"
|
||||
assert cfg.db.aco == "data/aco.duckdb"
|
||||
|
||||
|
||||
class TestContext:
|
||||
|
||||
Reference in New Issue
Block a user