Skip to content

Commit b3421d8

Browse files
matrixikryjones
authored andcommitted
Avoid mixing many env variable names for one functionality
Signed-off-by: Dobrosław Żybort <dobroslaw.zybort@fujitsu.com>
1 parent b4763c6 commit b3421d8

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

scripts/run_docker

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,25 +48,23 @@ if [ "$OSTYPE" == "msys" ]; then
4848
CONTAINER_RUNTIME="winpty docker"
4949
fi
5050

51-
ACAPY_CONTAINER_NAME="${CONTAINER_NAME}"
5251
if [ -n "${CONTAINER_NAME}" ]; then
5352
ARGS="${ARGS} --name ${CONTAINER_NAME}"
5453
else
5554
RAND_NAME=$(env LC_ALL=C tr -dc 'a-zA-Z0-9' </dev/urandom | fold -w 16 | head -n 1)
56-
ACAPY_CONTAINER_NAME="aries-cloudagent-runner_${RAND_NAME}"
57-
ARGS="${ARGS} --name ${ACAPY_CONTAINER_NAME}"
55+
CONTAINER_NAME="aries-cloudagent-runner_${RAND_NAME}"
56+
ARGS="${ARGS} --name ${CONTAINER_NAME}"
5857
fi
5958
echo ""
60-
echo "Container name: ${ACAPY_CONTAINER_NAME}"
59+
echo "Container name: ${CONTAINER_NAME}"
6160

62-
ACAPY_NETWORK_NAME="${NETWORK_NAME}"
61+
# Create new Docker network if it does not exist.
6362
if [ -n "${NETWORK_NAME}" ]; then
64-
# Create new Docker network if it does not exist.
6563
if [ -z "$("$CONTAINER_RUNTIME" network ls --filter name=^"${NETWORK_NAME}"$ --format="{{ .Name }}")" ]; then
66-
echo "Creating new Docker network: ${ACAPY_NETWORK_NAME}"
64+
echo "Creating new Docker network: ${NETWORK_NAME}"
6765
"$CONTAINER_RUNTIME" network create "${NETWORK_NAME}"
6866
else
69-
echo "Attaching to existing Docker network: ${ACAPY_NETWORK_NAME}"
67+
echo "Attaching to existing Docker network: ${NETWORK_NAME}"
7068
fi
7169
ARGS="${ARGS} --network ${NETWORK_NAME}"
7270
else

0 commit comments

Comments
 (0)