Merge branch 'main' into data/unify-project-status

Cargo.toml

@@ -53,7 +53,7 @@ axum-test = "15.6.0"
 fake = "2.9.2"
 
 [[bin]]
-name = "dsp-meta-server"
+name = "dsp-meta"
 path = "src/main-server.rs"
 
 [[bin]]

Dockerfile

@@ -15,7 +15,7 @@ COPY ./data /data
 # don't forget to set the env variable needed by the server
 ENV DSP_META_DATA_DIR=/data
 
-COPY --from=builder-rs /usr/local/cargo/bin/dsp-meta-server /usr/local/bin/dsp-meta-server
+COPY --from=builder-rs /usr/local/cargo/bin/dsp-meta /usr/local/bin/dsp-meta
 
 COPY --from=builder-node /dsp-meta/web-frontend/public /public
 ENV DSP_META_PUBLIC_DIR=/public
@@ -27,4 +27,4 @@ ENV DSP_META_LOG_FILTER="info,hyper=info"
 ENV DSP_META_LOG_FMT="json"
 
 EXPOSE 3000
-ENTRYPOINT ["dsp-meta-server"]
+ENTRYPOINT ["dsp-meta"]

justfile

@@ -1,10 +1,10 @@
-DOCKER_REPO := "daschswiss/dsp-meta-server"
+DOCKER_REPO := "daschswiss/dsp-meta"
 CARGO_VERSION := `cargo metadata --format-version=1 --no-deps | jq --raw-output '.packages[].version'`
 COMMIT_HASH := `git log --pretty=format:'%h' -n 1`
 IMAGE_TAG := CARGO_VERSION + "-" + COMMIT_HASH
 DOCKER_IMAGE := DOCKER_REPO + ":" + IMAGE_TAG
 
-# List all recipies
+# List all recipes
 default:
     just --list --unsorted
 
@@ -19,7 +19,7 @@ fmt:
     cargo +nightly fmt
     cd web-frontend && yarn fmt
 
-# Fix justfile formating. Warning: will change existing file. Please first use check.
+# Fix justfile formatting. Warning: will change existing file. Please first use check.
 fix:
     just --fmt --unstable
 
@@ -39,13 +39,13 @@ test:
 clean:
     cargo clean
 
-# Run dsp-meta-server
+# Run dsp-meta image
 serve: build-frontend clean
-    export DSP_META_DATA_DIR=${PWD}/data && export DSP_META_PUBLIC_DIR=${PWD}/web-frontend/public && export DSP_META_LOG_FILTER=trace,hyper=info && cargo run --bin dsp-meta-server
+    export DSP_META_DATA_DIR=${PWD}/data && export DSP_META_PUBLIC_DIR=${PWD}/web-frontend/public && export DSP_META_LOG_FILTER=trace,hyper=info && cargo run --bin dsp-meta
 
-# Run dsp-meta-server and watch for changes in the Rust code
+# Run dsp-meta image and watch for changes in the Rust code
 serve-dev:
-    export DSP_META_DATA_DIR=${PWD}/data && export DSP_META_PUBLIC_DIR=${PWD}/web-frontend/public && export DSP_META_LOG_FILTER=trace,hyper=info && cargo watch -x 'run --bin dsp-meta-server'
+    export DSP_META_DATA_DIR=${PWD}/data && export DSP_META_PUBLIC_DIR=${PWD}/web-frontend/public && export DSP_META_LOG_FILTER=trace,hyper=info && cargo watch -x 'run --bin dsp-meta'
 
 # Run the frontend dev server
 serve-frontend: