From 3852be6a3f3d4a73c12bb4bb2bdda65453180032 Mon Sep 17 00:00:00 2001 From: Marcin Procyk Date: Wed, 4 Sep 2024 15:10:15 +0200 Subject: [PATCH] build: rename dsp-meta Docker image (DEV-4077) (#224) --- Cargo.toml | 2 +- Dockerfile | 4 ++-- justfile | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f54c1d28..03f299ae 100644 --- a/Cargo.toml +++ b/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]] diff --git a/Dockerfile b/Dockerfile index 8e7fb5ca..ea7a3ab2 100644 --- a/Dockerfile +++ b/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"] diff --git a/justfile b/justfile index 6cfb9e8e..bdfaac73 100644 --- a/justfile +++ b/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: