[CICD] cleanup docker scripts

Closes: aptos-labs#738

config/management/genesis/src/command.rs

@@ -149,7 +149,7 @@ impl Command {
 }
 
 /// These tests depends on running Vault, which can be done by using the provided docker run script
-/// in `docker/vault/run.sh`.
+/// in `docker/testutils/start_vault_container.sh`.
 /// Note: Some of these tests may fail if you run them too quickly one after another due to data
 /// sychronization issues within Vault. It would seem the only way to fix it would be to restart
 /// the Vault service between runs.

consensus/safety-rules/src/tests/vault.rs

@@ -9,7 +9,7 @@ use aptos_vault_client::dev::{self, ROOT_TOKEN};
 
 /// A test for verifying VaultStorage properly supports the SafetyRule backend.  This test
 /// depends on running Vault, which can be done by using the provided docker run script in
-/// `docker/vault/run.sh`
+/// `docker/testutils/start_vault_container.sh`
 #[test]
 fn test() {
     if dev::test_host_safe().is_none() {

docker/vault/run.sh → docker/testutils/start_vault_container.sh

@@ -1,6 +1,10 @@
 #!/bin/sh
 # Copyright (c) Aptos
 # SPDX-License-Identifier: Apache-2.0
+
+# This script is a utility script used by some rust tests such as aptos-core/secure/storage/src/tests/vault.rs .
+# If this is not directly referenced anywhere in the codebase anymore you can delete it.
+
 set -ex
 
 IP="172.18.0.3"

docker/validator/Dockerfile

@@ -29,7 +29,8 @@ RUN apt-get update && apt-get install -y libssl1.1 && apt-get clean && rm -r /va
 RUN addgroup --system --gid 6180 aptos && adduser --system --ingroup aptos --no-create-home --uid 6180 aptos
 
 RUN mkdir -p /opt/aptos/bin /opt/aptos/etc
-COPY docker/install-tools.sh /root
+# TODO(geekflyer): Probable dead code - consider removing the 2 lines as install-tools.sh is not executed and therefore probably obsolete.
+COPY docker/validator/install-tools.sh /root
 COPY --from=builder /aptos/target/release/aptos-node /opt/aptos/bin
 COPY --from=builder /aptos/target/release/db-backup /opt/aptos/bin
 COPY --from=builder /aptos/target/release/db-bootstrapper /opt/aptos/bin

secure/storage/src/tests/suite.rs

@@ -15,7 +15,7 @@ use aptos_crypto::{
 /// This holds the canonical list of secure storage tests. It allows different callers
 /// of the test suite to ensure they're executing all tests.
 /// Note: this is required because: (i) vault tests cannot be run in the usual fashion (i.e., vault
-/// tests rely on first running the vault docker script in `docker/vault/run.sh`); and (ii) vault
+/// tests rely on first running the vault docker script in `docker/testutils/start_vault_container.sh`); and (ii) vault
 /// tests cannot currently be run in parallel, as each test uses the same vault instance.
 const STORAGE_TESTS: &[fn(&mut Storage)] = &[
     test_set_reset_get,

secure/storage/src/tests/vault.rs

@@ -50,7 +50,7 @@ const VAULT_TESTS: &[fn()] = &[
 
 /// A test for verifying VaultStorage properly implements the SecureStorage API and enforces
 /// strict separation between unique namespaces. This test depends on running Vault, which can be
-/// done by using the provided docker run script in `docker/vault/run.sh`
+/// done by using the provided docker run script in `docker/testutils/start_vault_container.sh`
 #[test]
 fn execute_storage_tests_vault() {
     if dev::test_host_safe().is_none() {