From 2e1d1018aa84f3896778c22694d760091d2890a7 Mon Sep 17 00:00:00 2001 From: overtrue Date: Sat, 12 Jul 2025 10:42:47 +0800 Subject: [PATCH] refactor: simplify version handling by removing unnecessary CLEAN_VERSION variable --- .docker/alpine/Dockerfile.prebuild | 5 +---- .docker/ubuntu/Dockerfile.prebuild | 5 +---- Dockerfile | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/.docker/alpine/Dockerfile.prebuild b/.docker/alpine/Dockerfile.prebuild index 05aee8cb..06e756f7 100644 --- a/.docker/alpine/Dockerfile.prebuild +++ b/.docker/alpine/Dockerfile.prebuild @@ -55,12 +55,9 @@ RUN if [ -n "$VERSION" ]; then \ \ # Handle VERSION with potential dev- prefix using variable expansion if [[ "$VERSION" == dev-* ]]; then \ - # Remove dev- prefix if present - CLEAN_VERSION="${VERSION#dev-}"; \ DOWNLOAD_PATH="artifacts/rustfs/dev"; \ - FILENAME="rustfs-linux-${ARCH}-dev-${CLEAN_VERSION}.zip"; \ + FILENAME="rustfs-linux-${ARCH}-dev-${VERSION#dev-}.zip"; \ else \ - # VERSION is a release version DOWNLOAD_PATH="artifacts/rustfs/release"; \ FILENAME="rustfs-linux-${ARCH}-v${VERSION}.zip"; \ fi; \ diff --git a/.docker/ubuntu/Dockerfile.prebuild b/.docker/ubuntu/Dockerfile.prebuild index ee9db6c9..28e741b7 100644 --- a/.docker/ubuntu/Dockerfile.prebuild +++ b/.docker/ubuntu/Dockerfile.prebuild @@ -75,12 +75,9 @@ RUN if [ -n "$VERSION" ]; then \ \ # Handle VERSION with potential dev- prefix using variable expansion if [[ "$VERSION" == dev-* ]]; then \ - # Remove dev- prefix if present - CLEAN_VERSION="${VERSION#dev-}"; \ DOWNLOAD_PATH="artifacts/rustfs/dev"; \ - FILENAME="rustfs-linux-${ARCH}-dev-${CLEAN_VERSION}.zip"; \ + FILENAME="rustfs-linux-${ARCH}-dev-${VERSION#dev-}.zip"; \ else \ - # VERSION is a release version DOWNLOAD_PATH="artifacts/rustfs/release"; \ FILENAME="rustfs-linux-${ARCH}-v${VERSION}.zip"; \ fi; \ diff --git a/Dockerfile b/Dockerfile index a235d8e0..dde2b491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -55,12 +55,9 @@ RUN if [ -n "$VERSION" ]; then \ \ # Handle VERSION with potential dev- prefix using variable expansion if [[ "$VERSION" == dev-* ]]; then \ - # Remove dev- prefix if present - CLEAN_VERSION="${VERSION#dev-}"; \ DOWNLOAD_PATH="artifacts/rustfs/dev"; \ - FILENAME="rustfs-linux-${ARCH}-dev-${CLEAN_VERSION}.zip"; \ + FILENAME="rustfs-linux-${ARCH}-dev-${VERSION#dev-}.zip"; \ else \ - # VERSION is a release version DOWNLOAD_PATH="artifacts/rustfs/release"; \ FILENAME="rustfs-linux-${ARCH}-v${VERSION}.zip"; \ fi; \