From 27a0cc9bb1f56229629951e14145a99ac1592ae8 Mon Sep 17 00:00:00 2001 From: SChernykh <15806605+SChernykh@users.noreply.github.com> Date: Fri, 11 Jul 2025 17:26:51 +0200 Subject: [PATCH] Build scripts: use unique names for temp containers --- scripts/compiler_tests/clang/build.sh | 10 +++++----- scripts/compiler_tests/gcc/build.sh | 10 +++++----- scripts/release/freebsd_aarch64/build.sh | 10 +++++----- scripts/release/freebsd_x64/build.sh | 10 +++++----- scripts/release/linux_aarch64/build.sh | 10 +++++----- scripts/release/linux_riscv64/build.sh | 10 +++++----- scripts/release/linux_x64/build.sh | 10 +++++----- scripts/release/macos_aarch64/build.sh | 10 +++++----- scripts/release/macos_x64/build.sh | 10 +++++----- scripts/release/source/build.sh | 10 +++++----- scripts/release/windows_x64/build.sh | 10 +++++----- 11 files changed, 55 insertions(+), 55 deletions(-) diff --git a/scripts/compiler_tests/clang/build.sh b/scripts/compiler_tests/clang/build.sh index f74bea6..cdf93da 100755 --- a/scripts/compiler_tests/clang/build.sh +++ b/scripts/compiler_tests/clang/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 --build-arg GCC_VERSION=$2 -t p2pool_compiler_test_clang_$2 . +docker build --build-arg P2POOL_VERSION=$1 --build-arg GCC_VERSION=$2 -t p2pool_compiler_test_clang_$1_$2 . -docker create --name p2pool_compiler_test_clang_$2_container p2pool_compiler_test_clang_$2:latest -docker cp p2pool_compiler_test_clang_$2_container:/p2pool/logs.tar.gz clang_$2_logs.tar.gz -docker rm p2pool_compiler_test_clang_$2_container +docker create --name p2pool_compiler_test_clang_$1_$2_container p2pool_compiler_test_clang_$1_$2:latest +docker cp p2pool_compiler_test_clang_$1_$2_container:/p2pool/logs.tar.gz clang_$2_logs.tar.gz +docker rm p2pool_compiler_test_clang_$1_$2_container -docker image rm -f p2pool_compiler_test_clang_$2 +docker image rm -f p2pool_compiler_test_clang_$1_$2 diff --git a/scripts/compiler_tests/gcc/build.sh b/scripts/compiler_tests/gcc/build.sh index c8de652..174422a 100755 --- a/scripts/compiler_tests/gcc/build.sh +++ b/scripts/compiler_tests/gcc/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 --build-arg GCC_VERSION=$2 -t p2pool_compiler_test_gcc_$2 . +docker build --build-arg P2POOL_VERSION=$1 --build-arg GCC_VERSION=$2 -t p2pool_compiler_test_gcc_$1_$2 . -docker create --name p2pool_compiler_test_gcc_$2_container p2pool_compiler_test_gcc_$2:latest -docker cp p2pool_compiler_test_gcc_$2_container:/p2pool/logs.tar.gz gcc_$2_logs.tar.gz -docker rm p2pool_compiler_test_gcc_$2_container +docker create --name p2pool_compiler_test_gcc_$1_$2_container p2pool_compiler_test_gcc_$1_$2:latest +docker cp p2pool_compiler_test_gcc_$1_$2_container:/p2pool/logs.tar.gz gcc_$2_logs.tar.gz +docker rm p2pool_compiler_test_gcc_$1_$2_container -docker image rm -f p2pool_compiler_test_gcc_$2 +docker image rm -f p2pool_compiler_test_gcc_$1_$2 diff --git a/scripts/release/freebsd_aarch64/build.sh b/scripts/release/freebsd_aarch64/build.sh index d0e5ceb..c4778aa 100755 --- a/scripts/release/freebsd_aarch64/build.sh +++ b/scripts/release/freebsd_aarch64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_aarch64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_aarch64_build_$1 . -docker create --name p2pool_freebsd_aarch64_build_container p2pool_freebsd_aarch64_build:latest -docker cp p2pool_freebsd_aarch64_build_container:/p2pool/build/p2pool-$1-freebsd-aarch64.tar.gz ../p2pool-$1-freebsd-aarch64.tar.gz -docker rm p2pool_freebsd_aarch64_build_container +docker create --name p2pool_freebsd_aarch64_build_$1_container p2pool_freebsd_aarch64_build_$1:latest +docker cp p2pool_freebsd_aarch64_build_$1_container:/p2pool/build/p2pool-$1-freebsd-aarch64.tar.gz ../p2pool-$1-freebsd-aarch64.tar.gz +docker rm p2pool_freebsd_aarch64_build_$1_container -docker image rm -f p2pool_freebsd_aarch64_build +docker image rm -f p2pool_freebsd_aarch64_build_$1 diff --git a/scripts/release/freebsd_x64/build.sh b/scripts/release/freebsd_x64/build.sh index 131cff1..5826277 100755 --- a/scripts/release/freebsd_x64/build.sh +++ b/scripts/release/freebsd_x64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_x64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_freebsd_x64_build_$1 . -docker create --name p2pool_freebsd_x64_build_container p2pool_freebsd_x64_build:latest -docker cp p2pool_freebsd_x64_build_container:/p2pool/build/p2pool-$1-freebsd-x64.tar.gz ../p2pool-$1-freebsd-x64.tar.gz -docker rm p2pool_freebsd_x64_build_container +docker create --name p2pool_freebsd_x64_build_$1_container p2pool_freebsd_x64_build_$1:latest +docker cp p2pool_freebsd_x64_build_$1_container:/p2pool/build/p2pool-$1-freebsd-x64.tar.gz ../p2pool-$1-freebsd-x64.tar.gz +docker rm p2pool_freebsd_x64_build_$1_container -docker image rm -f p2pool_freebsd_x64_build +docker image rm -f p2pool_freebsd_x64_build_$1 diff --git a/scripts/release/linux_aarch64/build.sh b/scripts/release/linux_aarch64/build.sh index 83f3332..ed8d66b 100755 --- a/scripts/release/linux_aarch64/build.sh +++ b/scripts/release/linux_aarch64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_aarch64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_aarch64_build_$1 . -docker create --name p2pool_ubuntu_aarch64_build_container p2pool_ubuntu_aarch64_build:latest -docker cp p2pool_ubuntu_aarch64_build_container:/p2pool/build/p2pool-$1-linux-aarch64.tar.gz ../p2pool-$1-linux-aarch64.tar.gz -docker rm p2pool_ubuntu_aarch64_build_container +docker create --name p2pool_ubuntu_aarch64_build_$1_container p2pool_ubuntu_aarch64_build_$1:latest +docker cp p2pool_ubuntu_aarch64_build_$1_container:/p2pool/build/p2pool-$1-linux-aarch64.tar.gz ../p2pool-$1-linux-aarch64.tar.gz +docker rm p2pool_ubuntu_aarch64_build_$1_container -docker image rm -f p2pool_ubuntu_aarch64_build +docker image rm -f p2pool_ubuntu_aarch64_build_$1 diff --git a/scripts/release/linux_riscv64/build.sh b/scripts/release/linux_riscv64/build.sh index 810d811..e47e165 100755 --- a/scripts/release/linux_riscv64/build.sh +++ b/scripts/release/linux_riscv64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_riscv64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_ubuntu_riscv64_build_$1 . -docker create --name p2pool_ubuntu_riscv64_build_container p2pool_ubuntu_riscv64_build:latest -docker cp p2pool_ubuntu_riscv64_build_container:/p2pool/build/p2pool-$1-linux-riscv64.tar.gz ../p2pool-$1-linux-riscv64.tar.gz -docker rm p2pool_ubuntu_riscv64_build_container +docker create --name p2pool_ubuntu_riscv64_build_$1_container p2pool_ubuntu_riscv64_build_$1:latest +docker cp p2pool_ubuntu_riscv64_build_$1_container:/p2pool/build/p2pool-$1-linux-riscv64.tar.gz ../p2pool-$1-linux-riscv64.tar.gz +docker rm p2pool_ubuntu_riscv64_build_$1_container -docker image rm -f p2pool_ubuntu_riscv64_build +docker image rm -f p2pool_ubuntu_riscv64_build_$1 diff --git a/scripts/release/linux_x64/build.sh b/scripts/release/linux_x64/build.sh index 19a9239..5503a6f 100755 --- a/scripts/release/linux_x64/build.sh +++ b/scripts/release/linux_x64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_linux_x64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_linux_x64_build_$1 . -docker create --name p2pool_linux_x64_build_container p2pool_linux_x64_build:latest -docker cp p2pool_linux_x64_build_container:/p2pool/build/p2pool-$1-linux-x64.tar.gz ../p2pool-$1-linux-x64.tar.gz -docker rm p2pool_linux_x64_build_container +docker create --name p2pool_linux_x64_build_$1_container p2pool_linux_x64_build_$1:latest +docker cp p2pool_linux_x64_build_$1_container:/p2pool/build/p2pool-$1-linux-x64.tar.gz ../p2pool-$1-linux-x64.tar.gz +docker rm p2pool_linux_x64_build_$1_container -docker image rm -f p2pool_linux_x64_build +docker image rm -f p2pool_linux_x64_build_$1 diff --git a/scripts/release/macos_aarch64/build.sh b/scripts/release/macos_aarch64/build.sh index 5468034..4e874c9 100755 --- a/scripts/release/macos_aarch64/build.sh +++ b/scripts/release/macos_aarch64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_macos_aarch64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_macos_aarch64_build_$1 . -docker create --name p2pool_macos_aarch64_build_container p2pool_macos_aarch64_build:latest -docker cp p2pool_macos_aarch64_build_container:/p2pool/build/p2pool-$1-macos-aarch64.tar.gz ../p2pool-$1-macos-aarch64.tar.gz -docker rm p2pool_macos_aarch64_build_container +docker create --name p2pool_macos_aarch64_build_$1_container p2pool_macos_aarch64_build_$1:latest +docker cp p2pool_macos_aarch64_build_$1_container:/p2pool/build/p2pool-$1-macos-aarch64.tar.gz ../p2pool-$1-macos-aarch64.tar.gz +docker rm p2pool_macos_aarch64_build_$1_container -docker image rm -f p2pool_macos_aarch64_build +docker image rm -f p2pool_macos_aarch64_build_$1 diff --git a/scripts/release/macos_x64/build.sh b/scripts/release/macos_x64/build.sh index 3d274f0..a36fbf2 100755 --- a/scripts/release/macos_x64/build.sh +++ b/scripts/release/macos_x64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_macos_x64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_macos_x64_build_$1 . -docker create --name p2pool_macos_x64_build_container p2pool_macos_x64_build:latest -docker cp p2pool_macos_x64_build_container:/p2pool/build/p2pool-$1-macos-x64.tar.gz ../p2pool-$1-macos-x64.tar.gz -docker rm p2pool_macos_x64_build_container +docker create --name p2pool_macos_x64_build_$1_container p2pool_macos_x64_build_$1:latest +docker cp p2pool_macos_x64_build_$1_container:/p2pool/build/p2pool-$1-macos-x64.tar.gz ../p2pool-$1-macos-x64.tar.gz +docker rm p2pool_macos_x64_build_$1_container -docker image rm -f p2pool_macos_x64_build +docker image rm -f p2pool_macos_x64_build_$1 diff --git a/scripts/release/source/build.sh b/scripts/release/source/build.sh index 5a41a82..b39fd93 100755 --- a/scripts/release/source/build.sh +++ b/scripts/release/source/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_source_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_source_build_$1 . -docker create --name p2pool_source_build_container p2pool_source_build:latest -docker cp p2pool_source_build_container:/p2pool_source-$1.tar.xz ../p2pool_source-$1.tar.xz -docker rm p2pool_source_build_container +docker create --name p2pool_source_build_$1_container p2pool_source_build_$1:latest +docker cp p2pool_source_build_$1_container:/p2pool_source-$1.tar.xz ../p2pool_source-$1.tar.xz +docker rm p2pool_source_build_$1_container -docker image rm -f p2pool_source_build +docker image rm -f p2pool_source_build_$1 diff --git a/scripts/release/windows_x64/build.sh b/scripts/release/windows_x64/build.sh index 2115c61..93a0073 100755 --- a/scripts/release/windows_x64/build.sh +++ b/scripts/release/windows_x64/build.sh @@ -4,10 +4,10 @@ cd "$(dirname "$0")" -docker build --build-arg P2POOL_VERSION=$1 -t p2pool_windows_x64_build . +docker build --build-arg P2POOL_VERSION=$1 -t p2pool_windows_x64_build_$1 . -docker create --name p2pool_windows_x64_build_container p2pool_windows_x64_build:latest -docker cp p2pool_windows_x64_build_container:/p2pool/build/p2pool-$1-windows-x64.zip ../p2pool-$1-windows-x64.zip -docker rm p2pool_windows_x64_build_container +docker create --name p2pool_windows_x64_build_$1_container p2pool_windows_x64_build_$1:latest +docker cp p2pool_windows_x64_build_$1_container:/p2pool/build/p2pool-$1-windows-x64.zip ../p2pool-$1-windows-x64.zip +docker rm p2pool_windows_x64_build_$1_container -docker image rm -f p2pool_windows_x64_build +docker image rm -f p2pool_windows_x64_build_$1