Skip to content

Commit 1357671

Browse files
matrixikryjones
authored andcommitted
Add ability to set docker container name
Signed-off-by: Dobrosław Żybort <dobroslaw.zybort@fujitsu.com>
1 parent 8a0d7cb commit 1357671

1 file changed

Lines changed: 26 additions & 11 deletions

File tree

scripts/run_docker

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ for arg in "$@"; do
2727
echo "Backing up database before running aca-py upgrade is highly recommended. Do you wish to proceed"
2828
select yn in "Yes" "No"; do
2929
case $yn in
30-
Yes) break ;;
31-
No) exit ;;
30+
Yes) break ;;
31+
No) exit ;;
3232
esac
3333
done
3434
fi
3535
done
36-
ACAPY_NETWORK_NAME="${NETWORK_NAME}"
36+
3737
if [ -n "${ENABLE_PTVSD}" ]; then
3838
ARGS="${ARGS} -e ENABLE_PTVSD=\"${ENABLE_PTVSD}\" -p $PTVSD_PORT:$PTVSD_PORT"
3939
fi
@@ -48,13 +48,28 @@ if [ "$OSTYPE" == "msys" ]; then
4848
CONTAINER_RUNTIME="winpty docker"
4949
fi
5050

51-
RAND_NAME=$(env LC_ALL=C tr -dc 'a-zA-Z0-9' < /dev/urandom | fold -w 16 | head -n 1)
52-
if [ -z "$NETWORK_NAME" ]; then
53-
echo "No Docker network specified."
54-
$CONTAINER_RUNTIME run --rm -ti --name "aries-cloudagent-runner_${RAND_NAME}" \
55-
$ARGS aries-cloudagent-run "$@"
51+
ACAPY_CONTAINER_NAME="${CONTAINER_NAME}"
52+
if [ -n "${CONTAINER_NAME}" ]; then
53+
ARGS="${ARGS} --name ${CONTAINER_NAME}"
54+
else
55+
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}"
58+
fi
59+
echo ""
60+
echo "Container name: ${ACAPY_CONTAINER_NAME}"
61+
62+
ACAPY_NETWORK_NAME="${NETWORK_NAME}"
63+
# Create new Docker network if it does not exist.
64+
if [ -n "${NETWORK_NAME}" ] && [ -z "$(docker network ls --filter name=^"${NETWORK_NAME}"$ --format="{{ .Name }}")" ]; then
65+
docker network create "${NETWORK_NAME}"
66+
fi
67+
if [ -n "${NETWORK_NAME}" ]; then
68+
echo "Docker network specified: ${ACAPY_NETWORK_NAME}"
69+
ARGS="${ARGS} --network ${NETWORK_NAME}"
5670
else
57-
echo "${ACAPY_NETWORK_NAME} Docker network specified."
58-
$CONTAINER_RUNTIME run --rm -ti --network $ACAPY_NETWORK_NAME --name "aries-cloudagent-runner_${RAND_NAME}" \
59-
$ARGS aries-cloudagent-run "$@"
71+
echo "No Docker network specified."
6072
fi
73+
echo ""
74+
75+
$CONTAINER_RUNTIME run --rm -ti $ARGS aries-cloudagent-run "$@"

0 commit comments

Comments
 (0)