Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/push_docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,9 @@ jobs:
- name: Push Image
if: github.event_name == 'push' || github.event_name == 'release'
run: |
devenv build outputs.lomas-oci 2>/dev/null | jq -r '.[]' | xargs -trn1 cat | skopeo copy docker-archive:/dev/stdin docker://dsccadminch/lomas:${DOCKER_METADATA_OUTPUT_VERSION:-debug}
devenv build outputs.lomas-oci-raw 2>/dev/null | jq -r '.[]' | xargs -trn1 cat | skopeo copy docker-archive:/dev/stdin docker://dsccadminch/lomas-raw:${DOCKER_METADATA_OUTPUT_VERSION:-debug}
IMAGE_OCI=$(devenv build outputs.lomas-oci 2>/dev/null)
IMAGE_OCI_RAW=$(devenv build outputs.lomas-oci-raw 2>/dev/null)
for tag in $DOCKER_METADATA_OUTPUT_TAGS; do
echo "$IMAGE_OCI" | jq -r '.[]' | xargs -trn1 cat | skopeo copy docker-archive:/dev/stdin docker://dsccadminch/lomas:${tag##*:}
echo "$IMAGE_OCI_RAW" | jq -r '.[]' | xargs -trn1 cat | skopeo copy docker-archive:/dev/stdin docker://dsccadminch/lomas-raw:${tag##*:}
done
2 changes: 1 addition & 1 deletion core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@
</h1><br>

# Core
See the technical documentation of core: https://dscc-admin-ch.github.io/lomas-docs/core_api.html.
See the technical documentation of core: https://dscc-admin-ch.github.io/lomas/latest/api/core/.
6 changes: 3 additions & 3 deletions deploy/charts/lomas/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ server:
image:
repository: dsccadminch/lomas-raw
imagePullPolicy: Always
tag: sha-3642bd3
tag: latest

initContainers:
image:
Expand Down Expand Up @@ -129,7 +129,7 @@ demoSetupJob:
image:
repository: dsccadminch/lomas-raw
imagePullPolicy: Always
tag: sha-3642bd3
tag: latest

config:
serverUrl: "https://lomas.example.com"
Expand All @@ -153,7 +153,7 @@ dashboard:
image:
repository: dsccadminch/lomas-raw
imagePullPolicy: Always
tag: sha-3642bd3
tag: latest

config:
# Specified here in case server ingress not managed by this chart.
Expand Down
2 changes: 1 addition & 1 deletion devenv.nix
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ in
scripts.docker-compose-test = wrapScript {
pwd = "server";
exec = ''
docker compose -f docker-compose.yml --env-file configs/.env.docker-compose run --rm lomas_client python -m lomas_client.scripts.run_notebook --notebook /code/client/notebooks/Minimalist_Demo_Client_Notebook.ipynb
docker compose -f docker-compose.yml --env-file configs/.env.docker-compose run --rm lomas_client python -m lomas_client.scripts.run_notebook --notebook /code/client/notebooks/Demo_Client_Notebook_OpenDP_Polars_features.ipynb
docker compose -f docker-compose.yml --env-file configs/.env.docker-compose down
'';
};
Expand Down
2 changes: 2 additions & 0 deletions devenv/docker-env.nix
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ in

install -dm 755 data/collections/
cp -r --no-preserve=all ${../server/data/collections}/metadata data/collections/
install -dm 755 data/datasets/
cp -r --no-preserve=all ${../server/data/datasets/covid_synthetic_data.csv} data/datasets/covid_synthetic_data.csv
'';
config = {
Cmd = [ "lomas-serve" ];
Expand Down
4 changes: 2 additions & 2 deletions server/data/collections/dataset_collection.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ datasets:
- dataset_name: "TITANIC"
dataset_access:
database_type: "PATH_DB"
path: "../data/datasets/titanic.csv"
path: "https://raw.githubusercontent.com/dscc-admin-ch/lomas/refs/heads/master/server/data/datasets/titanic.csv"
metadata_access:
database_type: "PATH_DB"
path: "../data/collections/metadata/titanic_metadata.json"
- dataset_name: "FSO_INCOME_SYNTHETIC"
dataset_access:
database_type: "PATH_DB"
path: "datasets/income_synthetic_data.csv"
path: "https://raw.githubusercontent.com/dscc-admin-ch/lomas/refs/heads/master/server/data/datasets/income_synthetic_data.csv"
metadata_access:
database_type: "PATH_DB"
path: "collections/metadata/fso_income_synthetic_metadata.json"
Expand Down
2 changes: 1 addition & 1 deletion server/data/collections/dataset_collection_devenv.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ datasets:
- dataset_name: "FSO_INCOME_SYNTHETIC"
dataset_access:
database_type: "PATH_DB"
path: "datasets/income_synthetic_data.csv"
path: "https://raw.githubusercontent.com/dscc-admin-ch/lomas/refs/heads/master/server/data/datasets/income_synthetic_data.csv"
metadata_access:
database_type: "PATH_DB"
path: "collections/metadata/fso_income_synthetic_metadata.json"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ datasets:
- dataset_name: "TITANIC"
dataset_access:
database_type: "PATH_DB"
path: "datasets/titanic.csv"
path: "https://raw.githubusercontent.com/dscc-admin-ch/lomas/refs/heads/master/server/data/datasets/titanic.csv"
metadata_access:
database_type: "PATH_DB"
path: "collections/metadata/titanic_metadata.json"
- dataset_name: "FSO_INCOME_SYNTHETIC"
dataset_access:
database_type: "PATH_DB"
path: "datasets/income_synthetic_data.csv"
path: "https://raw.githubusercontent.com/dscc-admin-ch/lomas/refs/heads/master/server/data/datasets/income_synthetic_data.csv"
metadata_access:
database_type: "PATH_DB"
path: "collections/metadata/fso_income_synthetic_metadata.json"
Expand Down
2 changes: 0 additions & 2 deletions server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ services:
- ./lomas_server:/code/server/lomas_server
- ../core/lomas_core:/code/core/lomas_core
- ./data/collections:/data/collections
- ./data/datasets:/data/datasets/
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:${LOMAS_SERVICE_PORT}/live"]
interval: 10s
Expand Down Expand Up @@ -42,7 +41,6 @@ services:
volumes:
- ./lomas_server:/code/server/lomas_server
- ../core/lomas_core:/code/core/lomas_core
- ./data/datasets:/data/datasets/
depends_on:
otel-collector:
condition: service_started
Expand Down
2 changes: 1 addition & 1 deletion server/lomas_server/administration/dashboard/about.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def about() -> None:

doc = (
"**Documentation**: [server documentation]"
"(https://dscc-admin-ch.github.io/lomas-docs/lomas_server.admin_database.html)"
"(https://dscc-admin-ch.github.io/lomas/latest/server/administration/)"
)
st.write(doc)
support = (
Expand Down
Loading