(iggy) branch master updated: chore(bench): fix Dockerfile paths (#1827)

[piotr]

This is an automated email from the ASF dual-hosted git repository.

piotr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iggy.git


The following commit(s) were added to refs/heads/master by this push:
     new 15181ee7 chore(bench): fix Dockerfile paths (#1827)
15181ee7 is described below

commit 15181ee7733697b8e7ab75141243edc82d3cf520
Author: Hubert Gruszecki <h.grusze...@gmail.com>
AuthorDate: Thu May 29 21:42:24 2025 +0200

    chore(bench): fix Dockerfile paths (#1827)
---
 core/bench/dashboard/README.md                   |  4 +++-
 core/bench/dashboard/server/Dockerfile           | 10 +++++-----
 core/bench/dashboard/server/docker-entrypoint.sh |  2 +-
 core/bench/dashboard/server/src/main.rs          |  6 ++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/bench/dashboard/README.md b/core/bench/dashboard/README.md
index be857d00..714ac098 100644
--- a/core/bench/dashboard/README.md
+++ b/core/bench/dashboard/README.md
@@ -184,8 +184,10 @@ Access the development version at <http://localhost:8060>
 
 ### Building the Image
 
+Call this from the root of the repository:
+
 ```bash
-docker build -t apache/iggy-bench-dashboard .
+docker build -t iggy-bench-dashboard -f core/bench/dashboard/server/Dockerfile 
.
 ```
 
 ### Running the Container
diff --git a/core/bench/dashboard/server/Dockerfile 
b/core/bench/dashboard/server/Dockerfile
index df89efe8..e1be2b12 100644
--- a/core/bench/dashboard/server/Dockerfile
+++ b/core/bench/dashboard/server/Dockerfile
@@ -16,7 +16,7 @@
 # under the License.
 
 # Build stage
-FROM rust:1.86-slim-bookworm as builder
+FROM rust:1.87-slim-bookworm AS builder
 
 WORKDIR /usr/src/iggy-bench-dashboard
 
@@ -42,7 +42,7 @@ RUN rustup target add wasm32-unknown-unknown
 COPY . .
 
 # Build frontend
-RUN cd frontend && trunk build --release
+RUN cd core/bench/dashboard/frontend && trunk build --release
 
 # Build the server with release profile
 RUN cargo build --release --package bench-dashboard-server
@@ -61,8 +61,8 @@ RUN apt-get update && apt-get install -y 
--no-install-recommends \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy the built binary and frontend files
-COPY --from=builder 
/usr/src/iggy-bench-dashboard/target/release/bench-dashboard-server /app/
-COPY --from=builder /usr/src/iggy-bench-dashboard/frontend/dist 
/app/frontend/dist
+COPY --from=builder 
/usr/src/iggy-bench-dashboard/target/release/iggy-bench-dashboard-server /app/
+COPY --from=builder 
/usr/src/iggy-bench-dashboard/core/bench/dashboard/frontend/dist 
/app/frontend/dist
 
 # Create data directory and non-root user
 RUN groupadd -r iggy && \
@@ -72,7 +72,7 @@ RUN groupadd -r iggy && \
     chmod -R 755 /data/performance_results
 
 # Copy the entrypoint script
-COPY docker-entrypoint.sh /app/
+COPY core/bench/dashboard/server/docker-entrypoint.sh /app/
 RUN chmod +x /app/docker-entrypoint.sh && \
     chown iggy:iggy /app/docker-entrypoint.sh
 
diff --git a/core/bench/dashboard/server/docker-entrypoint.sh 
b/core/bench/dashboard/server/docker-entrypoint.sh
index a6821d28..1f9b9d72 100644
--- a/core/bench/dashboard/server/docker-entrypoint.sh
+++ b/core/bench/dashboard/server/docker-entrypoint.sh
@@ -35,4 +35,4 @@ else
     echo "Polling GitHub disabled, GITHUB_TOKEN not set"
 fi
 
-exec /app/bench-dashboard-server "${ARGS[@]}"
+exec /app/iggy-bench-dashboard-server "${ARGS[@]}"
diff --git a/core/bench/dashboard/server/src/main.rs 
b/core/bench/dashboard/server/src/main.rs
index 57a58a12..acbdf03f 100644
--- a/core/bench/dashboard/server/src/main.rs
+++ b/core/bench/dashboard/server/src/main.rs
@@ -50,9 +50,7 @@ struct ServerState {
 }
 
 async fn index() -> actix_web::Result<NamedFile> {
-    Ok(NamedFile::open(
-        "core/bench/dashboard/frontend/dist/index.html",
-    )?)
+    Ok(NamedFile::open("frontend/dist/index.html")?)
 }
 
 #[actix_web::main]
@@ -162,7 +160,7 @@ async fn main() -> Result<(), std::io::Error> {
             .service(handlers::get_benchmark_trend)
             .service(handlers::get_test_artifacts_zip)
             .service(
-                fs::Files::new("/", "core/bench/dashboard/frontend/dist")
+                fs::Files::new("/", "frontend/dist")
                     .index_file("index.html")
                     .use_last_modified(true),
             )